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

Commit 3f7e5815 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3817/1: iop3xx: split the iop3xx mach into iop32x and iop33x 



Split the iop3xx mach type into iop32x and iop33x -- split the config
symbols, and move the code in the mach-iop3xx directory to the mach-iop32x
and mach-iop33x directories.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 98954df6

arch/arm/Kconfig

+15 −5
Original line number Diff line number Diff line
@@ -202,12 +202,20 @@ config ARCH_IMX 
	help

	  Support for Motorola's i.MX family of processors (MX1, MXL).



config ARCH_IOP3XX

	bool "IOP3xx-based"

config ARCH_IOP32X

	bool "IOP32x-based"

	depends on MMU

	select PCI

	help

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

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

	  processors.



config ARCH_IOP33X

	bool "IOP33x-based"

	depends on MMU

	select PCI

	help

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



config ARCH_IXP4XX

	bool "IXP4xx-based"
@@ -312,7 +320,9 @@ source "arch/arm/mach-footbridge/Kconfig" 


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



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

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



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



source "arch/arm/mach-ixp4xx/Kconfig"
@@ -848,7 +858,7 @@ source "drivers/block/Kconfig" 


source "drivers/acorn/block/Kconfig"



if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \

	|| ARCH_IXP23XX

arch/arm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ endif 
 machine-$(CONFIG_ARCH_INTEGRATOR) := integrator

 textofs-$(CONFIG_ARCH_CLPS711X)   := 0x00028000

 machine-$(CONFIG_ARCH_CLPS711X)   := clps711x

 machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx

 machine-$(CONFIG_ARCH_IOP32X)	   := iop32x

 machine-$(CONFIG_ARCH_IOP33X)	   := iop33x

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000

 machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx

arch/arm/configs/ep80219_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ CONFIG_KMOD=y 
# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

CONFIG_ARCH_IOP3XX=y

CONFIG_ARCH_IOP32X=y

# CONFIG_ARCH_IOP33X is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_L7200 is not set
@@ -93,8 +94,6 @@ CONFIG_ARCH_IQ31244=y 
# CONFIG_ARCH_IQ80331 is not set

# CONFIG_MACH_IQ80332 is not set

CONFIG_ARCH_EP80219=y

CONFIG_ARCH_IOP32X=y

# CONFIG_ARCH_IOP33X is not set



#

# IOP3xx Chipset Features

arch/arm/configs/iq31244_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ CONFIG_KMOD=y 
# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

CONFIG_ARCH_IOP3XX=y

CONFIG_ARCH_IOP32X=y

# CONFIG_ARCH_IOP33X is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_L7200 is not set
@@ -94,8 +95,6 @@ CONFIG_ARCH_IQ31244=y 
# CONFIG_ARCH_IQ80331 is not set

# CONFIG_MACH_IQ80332 is not set

# CONFIG_ARCH_EP80219 is not set

CONFIG_ARCH_IOP32X=y

# CONFIG_ARCH_IOP33X is not set



#

# IOP3xx Chipset Features

arch/arm/configs/iq80321_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ CONFIG_KMOD=y 
# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

CONFIG_ARCH_IOP3XX=y

CONFIG_ARCH_IOP32X=y

# CONFIG_ARCH_IOP33X is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_L7200 is not set
@@ -93,8 +94,6 @@ CONFIG_ARCH_IQ80321=y 
# CONFIG_ARCH_IQ80331 is not set

# CONFIG_MACH_IQ80332 is not set

# CONFIG_ARCH_EP80219 is not set

CONFIG_ARCH_IOP32X=y

# CONFIG_ARCH_IOP33X is not set



#

# IOP3xx Chipset Features