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

Commit ddb902cc authored by Rob Herring's avatar Rob Herring
Browse files

ARM: centralize common multi-platform kconfig options 



Multi-platform requires various kconfig options to be selected, so
platforms don't need to select them individually.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6d0abeca

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -306,9 +306,11 @@ choice 
config ARCH_MULTIPLATFORM

	bool "Allow multiple platforms to be selected"

	depends on MMU

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

arch/arm/mach-bcm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ config ARCH_BCM_MOBILE 
	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CPU_V7

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	select GPIO_BCM_KONA

	select SPARSE_IRQ

	select TICK_ONESHOT

	select CACHE_L2X0

	select HAVE_ARM_ARCH_TIMER

arch/arm/mach-bcm2835/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -4,10 +4,7 @@ config ARCH_BCM2835 
	select ARM_AMBA

	select ARM_ERRATA_411920

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select CLKSRC_OF

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select PINCTRL

	select PINCTRL_BCM2835

	help

arch/arm/mach-berlin/Kconfig

+0 −3
Original line number Diff line number Diff line 
config ARCH_BERLIN

	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7

	select ARM_GIC

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select COMMON_CLK

	select DW_APB_ICTL

	select DW_APB_TIMER_OF
@@ -21,7 +19,6 @@ config MACH_BERLIN_BG2 
config MACH_BERLIN_BG2CD

	bool "Marvell Armada 1500-mini (BG2CD)"

	select CACHE_L2X0

	select CPU_V7

	select HAVE_ARM_TWD if SMP



endmenu

arch/arm/mach-cns3xxx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config ARCH_CNS3XXX 
	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI