Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59d3ae9a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: remove Intel iop33x and iop13xx support 

There are three families of IOP machines we support in Linux: iop32x
(which includes EP80219), iop33x and iop13xx (aka IOP34x aka WP8134x).

All products we support in the kernel are based on the first of these,
iop32x, the other families only ever supported the Intel reference
boards but no actual machine anyone could ever buy.

While one could clearly make them all three work in a single kernel
with some work, this takes the easy way out, removing the later two
platforms entirely, under the assumption that there are no remaining
users.

Earlier versions of OpenWRT and Debian both had support for iop32x
but not the others, and they both dropped iop32x as well in their 2015
releases.

Link: https://lore.kernel.org/r/20190809163334.489360-1-arnd@arndb.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: Wolfram Sang <wsa@the-dreams.de> # for I2C parts
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarMartin Michlmayr <tbm@cyrius.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f63cf88f

MAINTAINERS

+0 −9
Original line number Original line Diff line number Diff line
@@ -1749,20 +1749,11 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

S:	Maintained

F:	arch/arm/mach-pxa/colibri-pxa270-income.c

F:	arch/arm/mach-pxa/colibri-pxa270-income.c





ARM/INTEL IOP13XX ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/INTEL IOP32X ARM ARCHITECTURE

ARM/INTEL IOP32X ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Maintained





ARM/INTEL IOP33X ARM ARCHITECTURE

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Orphan



ARM/INTEL IQ81342EX MACHINE SUPPORT

ARM/INTEL IQ81342EX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+0 −30
Original line number Original line Diff line number Diff line
@@ -263,7 +263,6 @@ config PHYS_OFFSET 
	default 0x00000000 if ARCH_EBSA110 || \

	default 0x00000000 if ARCH_EBSA110 || \

			ARCH_FOOTBRIDGE || \

			ARCH_FOOTBRIDGE || \

			ARCH_INTEGRATOR || \

			ARCH_INTEGRATOR || \

			ARCH_IOP13XX || \

			ARCH_REALVIEW

			ARCH_REALVIEW

	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC

	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC

	default 0x20000000 if ARCH_S5PV210

	default 0x20000000 if ARCH_S5PV210
@@ -376,19 +375,6 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.





config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU

	select CPU_XSC3

	select NEED_MACH_MEMORY_H

	select NEED_RET_TO_USER

	select FORCE_PCI

	select PLAT_IOP

	select VMSPLIT_1G

	select SPARSE_IRQ

	help

	  Support for Intel's IOP13XX (XScale) family of processors.



config ARCH_IOP32X

config ARCH_IOP32X

	bool "IOP32x-based"

	bool "IOP32x-based"

	depends on MMU

	depends on MMU
@@ -402,18 +388,6 @@ config ARCH_IOP32X 
	  Support for Intel's 80219 and IOP32X (XScale) family of

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  processors.

	  processors.





config ARCH_IOP33X

	bool "IOP33x-based"

	depends on MMU

	select CPU_XSCALE

	select GPIO_IOP

	select GPIOLIB

	select NEED_RET_TO_USER

	select FORCE_PCI

	select PLAT_IOP

	help

	  Support for Intel's IOP33X (XScale) family of processors.



config ARCH_IXP4XX

config ARCH_IXP4XX

	bool "IXP4xx-based"

	bool "IXP4xx-based"

	depends on MMU

	depends on MMU
@@ -706,12 +680,8 @@ source "arch/arm/mach-imx/Kconfig" 




source "arch/arm/mach-integrator/Kconfig"

source "arch/arm/mach-integrator/Kconfig"





source "arch/arm/mach-iop13xx/Kconfig"



source "arch/arm/mach-iop32x/Kconfig"

source "arch/arm/mach-iop32x/Kconfig"





source "arch/arm/mach-iop33x/Kconfig"



source "arch/arm/mach-ixp4xx/Kconfig"

source "arch/arm/mach-ixp4xx/Kconfig"





source "arch/arm/mach-keystone/Kconfig"

source "arch/arm/mach-keystone/Kconfig"

arch/arm/Kconfig.debug

+1 −7
Original line number Original line Diff line number Diff line
@@ -1560,9 +1560,7 @@ config DEBUG_UART_PL01X 




# Compatibility options for 8250

# Compatibility options for 8250

config DEBUG_UART_8250

config DEBUG_UART_8250

	def_bool ARCH_EBSA110 || \

	def_bool ARCH_EBSA110 || ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC

		ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \

		ARCH_RPC





config DEBUG_UART_PHYS

config DEBUG_UART_PHYS

	hex "Physical base address of debug UART"

	hex "Physical base address of debug UART"
@@ -1675,7 +1673,6 @@ config DEBUG_UART_PHYS 
	default 0xffc02000 if DEBUG_SOCFPGA_UART0

	default 0xffc02000 if DEBUG_SOCFPGA_UART0

	default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xffd82340 if ARCH_IOP13XX

	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0

	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0

	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2

	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2

	default 0xfff36000 if DEBUG_HIGHBANK_UART

	default 0xfff36000 if DEBUG_HIGHBANK_UART
@@ -1685,7 +1682,6 @@ config DEBUG_UART_PHYS 
	default 0xfffe8600 if DEBUG_BCM63XX_UART

	default 0xfffe8600 if DEBUG_BCM63XX_UART

	default 0xffffee00 if DEBUG_AT91_SAM9263_DBGU

	default 0xffffee00 if DEBUG_AT91_SAM9263_DBGU

	default 0xfffff200 if DEBUG_AT91_RM9200_DBGU

	default 0xfffff200 if DEBUG_AT91_RM9200_DBGU

	default 0xfffff700 if ARCH_IOP33X

	depends on ARCH_EP93XX || \

	depends on ARCH_EP93XX || \

	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_LL_UART_EFM32 || \

		DEBUG_LL_UART_EFM32 || \
@@ -1797,14 +1793,12 @@ config DEBUG_UART_VIRT 
	default 0xfedc0000 if DEBUG_EP93XX

	default 0xfedc0000 if DEBUG_EP93XX

	default 0xfee003f8 if DEBUG_FOOTBRIDGE_COM1

	default 0xfee003f8 if DEBUG_FOOTBRIDGE_COM1

	default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART

	default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART

	default 0xfee82340 if ARCH_IOP13XX

	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN

	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN

	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN

	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xfefff700 if ARCH_IOP33X

	default 0xff003000 if DEBUG_U300_UART

	default 0xff003000 if DEBUG_U300_UART

	default 0xffd01000 if DEBUG_HIP01_UART

	default 0xffd01000 if DEBUG_HIP01_UART

	default DEBUG_UART_PHYS if !MMU

	default DEBUG_UART_PHYS if !MMU

arch/arm/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -173,9 +173,7 @@ machine-$(CONFIG_ARCH_GEMINI) += gemini 
machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_HISI)		+= hisi

machine-$(CONFIG_ARCH_HISI)		+= hisi

machine-$(CONFIG_ARCH_INTEGRATOR)	+= integrator

machine-$(CONFIG_ARCH_INTEGRATOR)	+= integrator

machine-$(CONFIG_ARCH_IOP13XX)		+= iop13xx

machine-$(CONFIG_ARCH_IOP32X)		+= iop32x

machine-$(CONFIG_ARCH_IOP32X)		+= iop32x

machine-$(CONFIG_ARCH_IOP33X)		+= iop33x

machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx

machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone

machine-$(CONFIG_ARCH_LPC18XX)		+= lpc18xx

machine-$(CONFIG_ARCH_LPC18XX)		+= lpc18xx

arch/arm/configs/iop13xx_defconfig

deleted100644 → 0
+0 −118
Original line number Original line Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_IOP13XX=y

CONFIG_MACH_IQ81340SC=y

CONFIG_MACH_IQ81340MC=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="ip=bootp root=nfs console=ttyS0,115200 nfsroot=,tcp,v3,wsize=8192,rsize=8192"

CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_AOUT=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IPV6=y

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

# CONFIG_IPV6_SIT is not set

CONFIG_MTD=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y

CONFIG_MTD_REDBOOT_PARTS_READONLY=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=2

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_ISCSI_ATTRS=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_RAID0=y

CONFIG_MD_RAID1=y

CONFIG_MD_RAID10=y

CONFIG_MD_RAID456=y

CONFIG_BLK_DEV_DM=y

CONFIG_NETDEVICES=y

CONFIG_E1000=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_IOP3XX=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_DMADEVICES=y

CONFIG_INTEL_IOP_ADMA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_TMPFS=y

CONFIG_ECRYPT_FS=y

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

CONFIG_SMB_FS=m

CONFIG_CIFS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS=y

CONFIG_DEBUG_USER=y

CONFIG_KEYS=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_LRW=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MICHAEL_MIC=y

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_TGR192=y

CONFIG_CRYPTO_WP512=y

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_ANUBIS=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_BLOWFISH=y

CONFIG_CRYPTO_CAST5=y

CONFIG_CRYPTO_CAST6=y

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_KHAZAD=y

CONFIG_CRYPTO_SERPENT=y

CONFIG_CRYPTO_TEA=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRC_CCITT=y

CONFIG_LIBCRC32C=y