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

Commit c750815e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Arrange for platforms to select appropriate CPU support 



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: default avatarNicolas Pitre <nico@marvell.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Acked-by: default avatarBrian Swetland <swetland@google.com>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Acked-by: default avatarNicolas Bellido <ml@acolin.be>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 59f0cb0f

arch/arm/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ choice 


config ARCH_AAEC2000

	bool "Agilent AAEC-2000 based"

	select CPU_ARM920T

	select ARM_AMBA

	select HAVE_CLK

	help
@@ -245,6 +246,7 @@ config ARCH_AT91 


config ARCH_CLPS7500

	bool "Cirrus CL-PS7500FE"

	select CPU_ARM710

	select TIMER_ACORN

	select ISA

	select NO_IOPORT
@@ -254,11 +256,13 @@ config ARCH_CLPS7500 


config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	help

	  Support for Cirrus Logic 711x/721x based boards.



config ARCH_EBSA110

	bool "EBSA-110"

	select CPU_SA110

	select ISA

	select NO_IOPORT

	help
@@ -269,6 +273,7 @@ config ARCH_EBSA110 


config ARCH_EP93XX

	bool "EP93xx-based"

	select CPU_ARM920T

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_GPIO
@@ -279,6 +284,7 @@ config ARCH_EP93XX 


config ARCH_FOOTBRIDGE

	bool "FootBridge"

	select CPU_SA110

	select FOOTBRIDGE

	help

	  Support for systems based on the DC21285 companion chip
@@ -286,18 +292,21 @@ config ARCH_FOOTBRIDGE 


config ARCH_NETX

	bool "Hilscher NetX based"

	select CPU_ARM926T

	select ARM_VIC

	help

	  This enables support for systems based on the Hilscher NetX Soc



config ARCH_H720X

	bool "Hynix HMS720x-based"

	select CPU_ARM720T

	select ISA_DMA_API

	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_IMX

	bool "IMX"

	select CPU_ARM920T

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -307,6 +316,7 @@ config ARCH_IMX 
config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU

	select CPU_XSC3

	select PLAT_IOP

	select PCI

	select ARCH_SUPPORTS_MSI
@@ -317,6 +327,7 @@ config ARCH_IOP13XX 
config ARCH_IOP32X

	bool "IOP32x-based"

	depends on MMU

	select CPU_XSCALE

	select PLAT_IOP

	select PCI

	select GENERIC_GPIO
@@ -328,6 +339,7 @@ config ARCH_IOP32X 
config ARCH_IOP33X

	bool "IOP33x-based"

	depends on MMU

	select CPU_XSCALE

	select PLAT_IOP

	select PCI

	select GENERIC_GPIO
@@ -338,6 +350,7 @@ config ARCH_IOP33X 
config ARCH_IXP23XX

 	bool "IXP23XX-based"

	depends on MMU

	select CPU_XSC3

 	select PCI

	help

	  Support for Intel's IXP23xx (XScale) family of processors.
@@ -345,6 +358,7 @@ config ARCH_IXP23XX 
config ARCH_IXP2000

	bool "IXP2400/2800-based"

	depends on MMU

	select CPU_XSCALE

	select PCI

	help

	  Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -352,6 +366,7 @@ config ARCH_IXP2000 
config ARCH_IXP4XX

	bool "IXP4xx-based"

	depends on MMU

	select CPU_XSCALE

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -361,6 +376,7 @@ config ARCH_IXP4XX 


config ARCH_L7200

	bool "LinkUp-L7200"

	select CPU_ARM720T

	select FIQ

	help

	  Say Y here if you intend to run this kernel on a LinkUp Systems
@@ -374,6 +390,7 @@ config ARCH_L7200 


config ARCH_KIRKWOOD

	bool "Marvell Kirkwood"

	select CPU_FEROCEON

	select PCI

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -384,6 +401,7 @@ config ARCH_KIRKWOOD 


config ARCH_KS8695

	bool "Micrel/Kendin KS8695"

	select CPU_ARM922T

	select GENERIC_GPIO

	help

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@ -391,6 +409,7 @@ config ARCH_KS8695 


config ARCH_NS9XXX

	bool "NetSilicon NS9xxx"

	select CPU_ARM926T

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -403,6 +422,7 @@ config ARCH_NS9XXX 


config ARCH_LOKI

	bool "Marvell Loki (88RC8480)"

	select CPU_FEROCEON

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION
@@ -411,6 +431,7 @@ config ARCH_LOKI 


config ARCH_MV78XX0

	bool "Marvell MV78xx0"

	select CPU_FEROCEON

	select PCI

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -432,6 +453,7 @@ config ARCH_MXC 
config ARCH_ORION5X

	bool "Marvell Orion"

	depends on MMU

	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select GENERIC_TIME
@@ -444,6 +466,7 @@ config ARCH_ORION5X 


config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T

	select HAVE_CLK

	help

	  This enables support for Philips PNX4008 mobile platform.
@@ -477,6 +500,7 @@ config ARCH_RPC 


config ARCH_SA1100

	bool "SA1100-based"

	select CPU_SA1100

	select ISA

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MTD_XIP
@@ -500,6 +524,7 @@ config ARCH_S3C2410 


config ARCH_SHARK

	bool "Shark"

	select CPU_SA110

	select ISA

	select ISA_DMA

	select ZONE_DMA
@@ -510,6 +535,7 @@ config ARCH_SHARK 


config ARCH_LH7A40X

	bool "Sharp LH7A40X"

	select CPU_ARM922T

	select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM

	select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM

	help
@@ -520,6 +546,7 @@ config ARCH_LH7A40X 


config ARCH_DAVINCI

	bool "TI DaVinci"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO
@@ -541,6 +568,7 @@ config ARCH_OMAP 


config ARCH_MSM

	bool "Qualcomm MSM"

	select CPU_V6

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

arch/arm/mach-at91/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -7,36 +7,43 @@ choice 


config ARCH_AT91RM9200

	bool "AT91RM9200"

	select CPU_ARM920T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config ARCH_AT91SAM9260

	bool "AT91SAM9260 or AT91SAM9XE"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config ARCH_AT91SAM9261

	bool "AT91SAM9261"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config ARCH_AT91SAM9263

	bool "AT91SAM9263"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config ARCH_AT91SAM9G20

	bool "AT91SAM9G20"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config ARCH_AT91CAP9

	bool "AT91CAP9"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

arch/arm/mach-omap1/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -4,16 +4,19 @@ comment "OMAP Core Type" 
config ARCH_OMAP730

	depends on ARCH_OMAP1

	bool "OMAP730 Based System"

	select CPU_ARM926T

	select ARCH_OMAP_OTG



config ARCH_OMAP15XX

	depends on ARCH_OMAP1

	default y

	bool "OMAP15xx Based System"

	select CPU_ARM925T



config ARCH_OMAP16XX

	depends on ARCH_OMAP1

	bool "OMAP16xx Based System"

	select CPU_ARM926T

	select ARCH_OMAP_OTG



comment "OMAP Board Type"

arch/arm/mach-pxa/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -386,16 +386,19 @@ endmenu 


config PXA25x

	bool

	select CPU_XSCALE

	help

	  Select code specific to PXA21x/25x/26x variants



config PXA27x

	bool

	select CPU_XSCALE

	help

	  Select code specific to PXA27x variants



config PXA3xx

	bool

	select CPU_XSC3

	help

	  Select code specific to PXA3xx variants

arch/arm/mach-realview/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config MACH_REALVIEW_EB 
config REALVIEW_EB_ARM11MP

	bool "Support ARM11MPCore tile"

	depends on MACH_REALVIEW_EB

	select CPU_V6

	help

	  Enable support for the ARM11MPCore tile on the Realview platform.
@@ -33,6 +34,7 @@ config MACH_REALVIEW_PB11MP 


config MACH_REALVIEW_PB1176

	bool "Support RealView/PB1176 platform"

	select CPU_V6

	select ARM_GIC

	help

	  Include support for the ARM(R) RealView ARM1176 Platform Baseboard.