Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ARM] Arrange for platforms to select appropriate CPU support

Browse source 
Rather than:

	config CPU_BLAH
		bool
		depends on ARCH_FOO || MACH_BAR
		default y if ARCH_FOO || MACH_BAR

arrange for ARCH_FOO and MACH_BAR to select CPU_BLAH directly.

Acked-by: Nicolas Pitre <nico@marvell.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Acked-by: Brian Swetland <swetland@google.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2008-10-26 10:55:14 +00:00 committed by Russell King
parent 59f0cb0fdd
commit c750815e2d
13 changed files with 65 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
arch/arm/Kconfig
View file

@ -201,6 +201,7 @@ choice
config ARCH_AAEC2000 config ARCH_AAEC2000
bool "Agilent AAEC-2000 based" bool "Agilent AAEC-2000 based"
select CPU_ARM920T
select ARM_AMBA select ARM_AMBA
select HAVE_CLK select HAVE_CLK
help help
@ -245,6 +246,7 @@ config ARCH_AT91
config ARCH_CLPS7500 config ARCH_CLPS7500
bool "Cirrus CL-PS7500FE" bool "Cirrus CL-PS7500FE"
select CPU_ARM710
select TIMER_ACORN select TIMER_ACORN
select ISA select ISA
select NO_IOPORT select NO_IOPORT
@ -254,11 +256,13 @@ config ARCH_CLPS7500
config ARCH_CLPS711X config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x-based" bool "Cirrus Logic CLPS711x/EP721x-based"
select CPU_ARM720T
help help
Support for Cirrus Logic 711x/721x based boards. Support for Cirrus Logic 711x/721x based boards.
config ARCH_EBSA110 config ARCH_EBSA110
bool "EBSA-110" bool "EBSA-110"
select CPU_SA110
select ISA select ISA
select NO_IOPORT select NO_IOPORT
help help
@ -269,6 +273,7 @@ config ARCH_EBSA110
config ARCH_EP93XX config ARCH_EP93XX
bool "EP93xx-based" bool "EP93xx-based"
select CPU_ARM920T
select ARM_AMBA select ARM_AMBA
select ARM_VIC select ARM_VIC
select GENERIC_GPIO select GENERIC_GPIO
@ -279,6 +284,7 @@ config ARCH_EP93XX
config ARCH_FOOTBRIDGE config ARCH_FOOTBRIDGE
bool "FootBridge" bool "FootBridge"
select CPU_SA110
select FOOTBRIDGE select FOOTBRIDGE
help help
Support for systems based on the DC21285 companion chip Support for systems based on the DC21285 companion chip
@ -286,18 +292,21 @@ config ARCH_FOOTBRIDGE
config ARCH_NETX config ARCH_NETX
bool "Hilscher NetX based" bool "Hilscher NetX based"
select CPU_ARM926T
select ARM_VIC select ARM_VIC
help help
This enables support for systems based on the Hilscher NetX Soc This enables support for systems based on the Hilscher NetX Soc
config ARCH_H720X config ARCH_H720X
bool "Hynix HMS720x-based" bool "Hynix HMS720x-based"
select CPU_ARM720T
select ISA_DMA_API select ISA_DMA_API
help help
This enables support for systems based on the Hynix HMS720x This enables support for systems based on the Hynix HMS720x
config ARCH_IMX config ARCH_IMX
bool "IMX" bool "IMX"
select CPU_ARM920T
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -307,6 +316,7 @@ config ARCH_IMX
config ARCH_IOP13XX config ARCH_IOP13XX
bool "IOP13xx-based" bool "IOP13xx-based"
depends on MMU depends on MMU
select CPU_XSC3
select PLAT_IOP select PLAT_IOP
select PCI select PCI
select ARCH_SUPPORTS_MSI select ARCH_SUPPORTS_MSI
@ -317,6 +327,7 @@ config ARCH_IOP13XX
config ARCH_IOP32X config ARCH_IOP32X
bool "IOP32x-based" bool "IOP32x-based"
depends on MMU depends on MMU
select CPU_XSCALE
select PLAT_IOP select PLAT_IOP
select PCI select PCI
select GENERIC_GPIO select GENERIC_GPIO
@ -328,6 +339,7 @@ config ARCH_IOP32X
config ARCH_IOP33X config ARCH_IOP33X
bool "IOP33x-based" bool "IOP33x-based"
depends on MMU depends on MMU
select CPU_XSCALE
select PLAT_IOP select PLAT_IOP
select PCI select PCI
select GENERIC_GPIO select GENERIC_GPIO
@ -338,6 +350,7 @@ config ARCH_IOP33X
config ARCH_IXP23XX config ARCH_IXP23XX
bool "IXP23XX-based" bool "IXP23XX-based"
depends on MMU depends on MMU
select CPU_XSC3
select PCI select PCI
help help
Support for Intel's IXP23xx (XScale) family of processors. Support for Intel's IXP23xx (XScale) family of processors.
@ -345,6 +358,7 @@ config ARCH_IXP23XX
config ARCH_IXP2000 config ARCH_IXP2000
bool "IXP2400/2800-based" bool "IXP2400/2800-based"
depends on MMU depends on MMU
select CPU_XSCALE
select PCI select PCI
help help
Support for Intel's IXP2400/2800 (XScale) family of processors. Support for Intel's IXP2400/2800 (XScale) family of processors.
@ -352,6 +366,7 @@ config ARCH_IXP2000
config ARCH_IXP4XX config ARCH_IXP4XX
bool "IXP4xx-based" bool "IXP4xx-based"
depends on MMU depends on MMU
select CPU_XSCALE
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -361,6 +376,7 @@ config ARCH_IXP4XX
config ARCH_L7200 config ARCH_L7200
bool "LinkUp-L7200" bool "LinkUp-L7200"
select CPU_ARM720T
select FIQ select FIQ
help help
Say Y here if you intend to run this kernel on a LinkUp Systems Say Y here if you intend to run this kernel on a LinkUp Systems
@ -374,6 +390,7 @@ config ARCH_L7200
config ARCH_KIRKWOOD config ARCH_KIRKWOOD
bool "Marvell Kirkwood" bool "Marvell Kirkwood"
select CPU_FEROCEON
select PCI select PCI
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -384,6 +401,7 @@ config ARCH_KIRKWOOD
config ARCH_KS8695 config ARCH_KS8695
bool "Micrel/Kendin KS8695" bool "Micrel/Kendin KS8695"
select CPU_ARM922T
select GENERIC_GPIO select GENERIC_GPIO
help help
Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@ -391,6 +409,7 @@ config ARCH_KS8695
config ARCH_NS9XXX config ARCH_NS9XXX
bool "NetSilicon NS9xxx" bool "NetSilicon NS9xxx"
select CPU_ARM926T
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -403,6 +422,7 @@ config ARCH_NS9XXX
config ARCH_LOKI config ARCH_LOKI
bool "Marvell Loki (88RC8480)" bool "Marvell Loki (88RC8480)"
select CPU_FEROCEON
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select PLAT_ORION select PLAT_ORION
@ -411,6 +431,7 @@ config ARCH_LOKI
config ARCH_MV78XX0 config ARCH_MV78XX0
bool "Marvell MV78xx0" bool "Marvell MV78xx0"
select CPU_FEROCEON
select PCI select PCI
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -432,6 +453,7 @@ config ARCH_MXC
config ARCH_ORION5X config ARCH_ORION5X
bool "Marvell Orion" bool "Marvell Orion"
depends on MMU depends on MMU
select CPU_FEROCEON
select PCI select PCI
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
@ -444,6 +466,7 @@ config ARCH_ORION5X
config ARCH_PNX4008 config ARCH_PNX4008
bool "Philips Nexperia PNX4008 Mobile" bool "Philips Nexperia PNX4008 Mobile"
select CPU_ARM926T
select HAVE_CLK select HAVE_CLK
help help
This enables support for Philips PNX4008 mobile platform. This enables support for Philips PNX4008 mobile platform.
@ -477,6 +500,7 @@ config ARCH_RPC
config ARCH_SA1100 config ARCH_SA1100
bool "SA1100-based" bool "SA1100-based"
select CPU_SA1100
select ISA select ISA
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select ARCH_MTD_XIP select ARCH_MTD_XIP
@ -500,6 +524,7 @@ config ARCH_S3C2410
config ARCH_SHARK config ARCH_SHARK
bool "Shark" bool "Shark"
select CPU_SA110
select ISA select ISA
select ISA_DMA select ISA_DMA
select ZONE_DMA select ZONE_DMA
@ -510,6 +535,7 @@ config ARCH_SHARK
config ARCH_LH7A40X config ARCH_LH7A40X
bool "Sharp LH7A40X" bool "Sharp LH7A40X"
select CPU_ARM922T
select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
help help
@ -520,6 +546,7 @@ config ARCH_LH7A40X
config ARCH_DAVINCI config ARCH_DAVINCI
bool "TI DaVinci" bool "TI DaVinci"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_GPIO select GENERIC_GPIO
@ -541,6 +568,7 @@ config ARCH_OMAP
config ARCH_MSM config ARCH_MSM
bool "Qualcomm MSM" bool "Qualcomm MSM"
select CPU_V6
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
help help

7
arch/arm/mach-at91/Kconfig
View file

@ -7,36 +7,43 @@ choice
config ARCH_AT91RM9200 config ARCH_AT91RM9200
bool "AT91RM9200" bool "AT91RM9200"
select CPU_ARM920T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
config ARCH_AT91SAM9260 config ARCH_AT91SAM9260
bool "AT91SAM9260 or AT91SAM9XE" bool "AT91SAM9260 or AT91SAM9XE"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
config ARCH_AT91SAM9261 config ARCH_AT91SAM9261
bool "AT91SAM9261" bool "AT91SAM9261"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
config ARCH_AT91SAM9263 config ARCH_AT91SAM9263
bool "AT91SAM9263" bool "AT91SAM9263"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
config ARCH_AT91SAM9RL config ARCH_AT91SAM9RL
bool "AT91SAM9RL" bool "AT91SAM9RL"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
config ARCH_AT91SAM9G20 config ARCH_AT91SAM9G20
bool "AT91SAM9G20" bool "AT91SAM9G20"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
config ARCH_AT91CAP9 config ARCH_AT91CAP9
bool "AT91CAP9" bool "AT91CAP9"
select CPU_ARM926T
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS

3
arch/arm/mach-omap1/Kconfig
View file

@ -4,16 +4,19 @@ comment "OMAP Core Type"
config ARCH_OMAP730 config ARCH_OMAP730
depends on ARCH_OMAP1 depends on ARCH_OMAP1
bool "OMAP730 Based System" bool "OMAP730 Based System"
select CPU_ARM926T
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
config ARCH_OMAP15XX config ARCH_OMAP15XX
depends on ARCH_OMAP1 depends on ARCH_OMAP1
default y default y
bool "OMAP15xx Based System" bool "OMAP15xx Based System"
select CPU_ARM925T
config ARCH_OMAP16XX config ARCH_OMAP16XX
depends on ARCH_OMAP1 depends on ARCH_OMAP1
bool "OMAP16xx Based System" bool "OMAP16xx Based System"
select CPU_ARM926T
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
comment "OMAP Board Type" comment "OMAP Board Type"

3
arch/arm/mach-pxa/Kconfig
View file

@ -386,16 +386,19 @@ endmenu
config PXA25x config PXA25x
bool bool
select CPU_XSCALE
help help
Select code specific to PXA21x/25x/26x variants Select code specific to PXA21x/25x/26x variants
config PXA27x config PXA27x
bool bool
select CPU_XSCALE
help help
Select code specific to PXA27x variants Select code specific to PXA27x variants
config PXA3xx config PXA3xx
bool bool
select CPU_XSC3
help help
Select code specific to PXA3xx variants Select code specific to PXA3xx variants

2
arch/arm/mach-realview/Kconfig
View file

@ -10,6 +10,7 @@ config MACH_REALVIEW_EB
config REALVIEW_EB_ARM11MP config REALVIEW_EB_ARM11MP
bool "Support ARM11MPCore tile" bool "Support ARM11MPCore tile"
depends on MACH_REALVIEW_EB depends on MACH_REALVIEW_EB
select CPU_V6
help help
Enable support for the ARM11MPCore tile on the Realview platform. Enable support for the ARM11MPCore tile on the Realview platform.
@ -33,6 +34,7 @@ config MACH_REALVIEW_PB11MP
config MACH_REALVIEW_PB1176 config MACH_REALVIEW_PB1176
bool "Support RealView/PB1176 platform" bool "Support RealView/PB1176 platform"
select CPU_V6
select ARM_GIC select ARM_GIC
help help
Include support for the ARM(R) RealView ARM1176 Platform Baseboard. Include support for the ARM(R) RealView ARM1176 Platform Baseboard.

1
arch/arm/mach-s3c2410/Kconfig
View file

@ -7,6 +7,7 @@
config CPU_S3C2410 config CPU_S3C2410
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select CPU_ARM920T
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_GPIO select S3C2410_GPIO
select CPU_LLSERIAL_S3C2410 select CPU_LLSERIAL_S3C2410

1
arch/arm/mach-s3c2412/Kconfig
View file

@ -7,6 +7,7 @@
config CPU_S3C2412 config CPU_S3C2412
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select CPU_ARM926T
select CPU_LLSERIAL_S3C2440 select CPU_LLSERIAL_S3C2440
select S3C2412_PM if PM select S3C2412_PM if PM
select S3C2412_DMA if S3C2410_DMA select S3C2412_DMA if S3C2410_DMA

1
arch/arm/mach-s3c2440/Kconfig
View file

@ -7,6 +7,7 @@
config CPU_S3C2440 config CPU_S3C2440
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select CPU_ARM920T
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_PM if PM select S3C2410_PM if PM
select S3C2410_GPIO select S3C2410_GPIO

1
arch/arm/mach-s3c2442/Kconfig
View file

@ -7,6 +7,7 @@
config CPU_S3C2442 config CPU_S3C2442
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select CPU_ARM920T
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_GPIO select S3C2410_GPIO
select S3C2410_PM if PM select S3C2410_PM if PM

2
arch/arm/mach-versatile/Kconfig
View file

@ -3,12 +3,14 @@ menu "Versatile platform type"
config ARCH_VERSATILE_PB config ARCH_VERSATILE_PB
bool "Support Versatile/PB platform" bool "Support Versatile/PB platform"
select CPU_ARM926T
default y default y
help help
Include support for the ARM(R) Versatile/PB platform. Include support for the ARM(R) Versatile/PB platform.
config MACH_VERSATILE_AB config MACH_VERSATILE_AB
bool "Support Versatile/AB platform" bool "Support Versatile/AB platform"
select CPU_ARM926T
help help
Include support for the ARM(R) Versatile/AP platform. Include support for the ARM(R) Versatile/AP platform.

65
arch/arm/mm/Kconfig
View file

@ -10,8 +10,7 @@ config CPU_32
# ARM610 # ARM610
config CPU_ARM610 config CPU_ARM610
bool "Support ARM610 processor" bool "Support ARM610 processor" if ARCH_RPC
depends on ARCH_RPC
select CPU_32v3 select CPU_32v3
select CPU_CACHE_V3 select CPU_CACHE_V3
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
@ -43,8 +42,7 @@ config CPU_ARM7TDMI
# ARM710 # ARM710
config CPU_ARM710 config CPU_ARM710
bool "Support ARM710 processor" if !ARCH_CLPS7500 && ARCH_RPC bool "Support ARM710 processor" if ARCH_RPC
default y if ARCH_CLPS7500
select CPU_32v3 select CPU_32v3
select CPU_CACHE_V3 select CPU_CACHE_V3
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
@ -63,8 +61,7 @@ config CPU_ARM710
# ARM720T # ARM720T
config CPU_ARM720T config CPU_ARM720T
bool "Support ARM720T processor" if !ARCH_CLPS711X && !ARCH_L7200 && !ARCH_CDB89712 && ARCH_INTEGRATOR bool "Support ARM720T processor" if ARCH_INTEGRATOR
default y if ARCH_CLPS711X || ARCH_L7200 || ARCH_CDB89712 || ARCH_H720X
select CPU_32v4T select CPU_32v4T
select CPU_ABRT_LV4T select CPU_ABRT_LV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -114,9 +111,7 @@ config CPU_ARM9TDMI
# ARM920T # ARM920T
config CPU_ARM920T config CPU_ARM920T
bool "Support ARM920T processor" bool "Support ARM920T processor" if ARCH_INTEGRATOR
depends on ARCH_EP93XX || ARCH_INTEGRATOR || CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200
default y if CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_AT91RM9200
select CPU_32v4T select CPU_32v4T
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -138,8 +133,6 @@ config CPU_ARM920T
# ARM922T # ARM922T
config CPU_ARM922T config CPU_ARM922T
bool "Support ARM922T processor" if ARCH_INTEGRATOR bool "Support ARM922T processor" if ARCH_INTEGRATOR
depends on ARCH_LH7A40X || ARCH_INTEGRATOR || ARCH_KS8695
default y if ARCH_LH7A40X || ARCH_KS8695
select CPU_32v4T select CPU_32v4T
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -159,8 +152,6 @@ config CPU_ARM922T
# ARM925T # ARM925T
config CPU_ARM925T config CPU_ARM925T
bool "Support ARM925T processor" if ARCH_OMAP1 bool "Support ARM925T processor" if ARCH_OMAP1
depends on ARCH_OMAP15XX
default y if ARCH_OMAP15XX
select CPU_32v4T select CPU_32v4T
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -179,22 +170,7 @@ config CPU_ARM925T
# ARM926T # ARM926T
config CPU_ARM926T config CPU_ARM926T
bool "Support ARM926T processor" bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || \
MACH_VERSATILE_AB || ARCH_OMAP730 || \
ARCH_OMAP16XX || MACH_REALVIEW_EB || \
ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \
ARCH_OMAP730 || ARCH_OMAP16XX || \
ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5TJ select CPU_ABRT_EV5TJ
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -247,8 +223,7 @@ config CPU_ARM946E
# ARM1020 - needs validating # ARM1020 - needs validating
config CPU_ARM1020 config CPU_ARM1020
bool "Support ARM1020T (rev 0) processor" bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR
depends on ARCH_INTEGRATOR
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -266,8 +241,7 @@ config CPU_ARM1020
# ARM1020E - needs validating # ARM1020E - needs validating
config CPU_ARM1020E config CPU_ARM1020E
bool "Support ARM1020E processor" bool "Support ARM1020E processor" if ARCH_INTEGRATOR
depends on ARCH_INTEGRATOR
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -280,8 +254,7 @@ config CPU_ARM1020E
# ARM1022E # ARM1022E
config CPU_ARM1022 config CPU_ARM1022
bool "Support ARM1022E processor" bool "Support ARM1022E processor" if ARCH_INTEGRATOR
depends on ARCH_INTEGRATOR
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -299,8 +272,7 @@ config CPU_ARM1022
# ARM1026EJ-S # ARM1026EJ-S
config CPU_ARM1026 config CPU_ARM1026
bool "Support ARM1026EJ-S processor" bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR
depends on ARCH_INTEGRATOR
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -317,8 +289,7 @@ config CPU_ARM1026
# SA110 # SA110
config CPU_SA110 config CPU_SA110
bool "Support StrongARM(R) SA-110 processor" if !ARCH_EBSA110 && !FOOTBRIDGE && !ARCH_TBOX && !ARCH_SHARK && !ARCH_NEXUSPCI && ARCH_RPC bool "Support StrongARM(R) SA-110 processor" if ARCH_RPC
default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_TBOX || ARCH_SHARK || ARCH_NEXUSPCI
select CPU_32v3 if ARCH_RPC select CPU_32v3 if ARCH_RPC
select CPU_32v4 if !ARCH_RPC select CPU_32v4 if !ARCH_RPC
select CPU_ABRT_EV4 select CPU_ABRT_EV4
@ -340,8 +311,6 @@ config CPU_SA110
# SA1100 # SA1100
config CPU_SA1100 config CPU_SA1100
bool bool
depends on ARCH_SA1100
default y
select CPU_32v4 select CPU_32v4
select CPU_ABRT_EV4 select CPU_ABRT_EV4
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -353,8 +322,6 @@ config CPU_SA1100
# XScale # XScale
config CPU_XSCALE config CPU_XSCALE
bool bool
depends on ARCH_IOP32X || ARCH_IOP33X || PXA25x || PXA27x || ARCH_IXP4XX || ARCH_IXP2000
default y
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T select CPU_ABRT_EV5T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -365,8 +332,6 @@ config CPU_XSCALE
# XScale Core Version 3 # XScale Core Version 3
config CPU_XSC3 config CPU_XSC3
bool bool
depends on ARCH_IXP23XX || ARCH_IOP13XX || PXA3xx
default y
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T select CPU_ABRT_EV5T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -378,8 +343,6 @@ config CPU_XSC3
# Feroceon # Feroceon
config CPU_FEROCEON config CPU_FEROCEON
bool bool
depends on ARCH_ORION5X || ARCH_LOKI || ARCH_KIRKWOOD || ARCH_MV78XX0
default y
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T select CPU_ABRT_EV5T
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -399,10 +362,7 @@ config CPU_FEROCEON_OLD_ID
# ARMv6 # ARMv6
config CPU_V6 config CPU_V6
bool "Support ARM V6 processor" bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
default y if ARCH_MX3
default y if ARCH_MSM
select CPU_32v6 select CPU_32v6
select CPU_ABRT_EV6 select CPU_ABRT_EV6
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR
@ -427,8 +387,7 @@ config CPU_32v6K
# ARMv7 # ARMv7
config CPU_V7 config CPU_V7
bool "Support ARM V7 processor" bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3
select CPU_32v6K select CPU_32v6K
select CPU_32v7 select CPU_32v7
select CPU_ABRT_EV7 select CPU_ABRT_EV7

2
arch/arm/plat-mxc/Kconfig
View file

@ -8,11 +8,13 @@ choice
config ARCH_MX2 config ARCH_MX2
bool "MX2-based" bool "MX2-based"
select CPU_ARM926T
help help
This enables support for systems based on the Freescale i.MX2 family This enables support for systems based on the Freescale i.MX2 family
config ARCH_MX3 config ARCH_MX3
bool "MX3-based" bool "MX3-based"
select CPU_V6
help help
This enables support for systems based on the Freescale i.MX3 family This enables support for systems based on the Freescale i.MX3 family

2
arch/arm/plat-omap/Kconfig
View file

@ -14,9 +14,11 @@ config ARCH_OMAP1
config ARCH_OMAP2 config ARCH_OMAP2
bool "TI OMAP2" bool "TI OMAP2"
select CPU_V6
config ARCH_OMAP3 config ARCH_OMAP3
bool "TI OMAP3" bool "TI OMAP3"
select CPU_V7
endchoice endchoice