xtensa: remove s6000 variant and s6105 platform

The Stretch s6000 family support has been merged into mainline 5 years
ago. There appear to be no users of this code since nobody complained
that there is a merge error preventing compilation.

Apart from the s6105 IP camera reference design there are no s6000 devices
known to ever have run Linux and as the chips are out of production there
probably never will be. The successor s7000 no longer uses an Xtensa core
for the OS.

Let's remove the code until someone is found who actually needs it.

Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index f860dbe..8cdbc4c 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -98,12 +98,6 @@ config XTENSA_VARIANT_DC233C
        help
          This variant refers to Tensilica's Diamond 233L Standard core Rev.C (LE).
 
-config XTENSA_VARIANT_S6000
-       bool "s6000 - Stretch software configurable processor"
-       select VARIANT_IRQ_SWITCH
-       select ARCH_REQUIRE_GPIOLIB
-       select XTENSA_CALIBRATE_CCOUNT
-
 config XTENSA_VARIANT_CUSTOM
        bool "Custom Xtensa processor configuration"
        select MAY_HAVE_SMP
@@ -126,7 +120,6 @@ config XTENSA_VARIANT_NAME
        default "dc232b"                        if XTENSA_VARIANT_DC232B
        default "dc233c"                        if XTENSA_VARIANT_DC233C
        default "fsf"                           if XTENSA_VARIANT_FSF
-       default "s6000"                         if XTENSA_VARIANT_S6000
        default XTENSA_VARIANT_CUSTOM_NAME      if XTENSA_VARIANT_CUSTOM
 
 config XTENSA_VARIANT_MMU
@@ -310,12 +303,6 @@ config XTENSA_PLATFORM_XT2000
          XT2000 is the name of Tensilica's feature-rich emulation platform.
          This hardware is capable of running a full Linux distribution.
 
-config XTENSA_PLATFORM_S6105
-       bool "S6105"
-       select HAVE_IDE
-       select SERIAL_CONSOLE
-       select NO_IOPORT_MAP
-
 config XTENSA_PLATFORM_XTFPGA
        bool "XTFPGA"
        select ETHOC if ETHERNET

diff --cc arch/xtensa/Makefile
Simple merge

diff --cc arch/xtensa/configs/iss_defconfig
Simple merge

diff --cc arch/xtensa/configs/s6105_defconfig
Simple merge

diff --cc arch/xtensa/platforms/s6105/Makefile
Simple merge

diff --cc arch/xtensa/platforms/s6105/device.c
Simple merge

diff --cc arch/xtensa/platforms/s6105/include/platform/gpio.h
Simple merge

diff --cc arch/xtensa/platforms/s6105/include/platform/hardware.h
Simple merge

diff --cc arch/xtensa/platforms/s6105/include/platform/serial.h
Simple merge

diff --cc arch/xtensa/platforms/s6105/setup.c
Simple merge

diff --cc arch/xtensa/variants/s6000/Makefile
Simple merge

diff --cc arch/xtensa/variants/s6000/delay.c
Simple merge

diff --cc arch/xtensa/variants/s6000/dmac.c
Simple merge

diff --cc arch/xtensa/variants/s6000/gpio.c
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/core.h
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/dmac.h
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/gpio.h
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/hardware.h
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/irq.h
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/tie-asm.h
Simple merge

diff --cc arch/xtensa/variants/s6000/include/variant/tie.h
Simple merge

diff --cc arch/xtensa/variants/s6000/irq.c
Simple merge