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

Commit 21278aea authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

ARM: use menuconfig for sub-arch menus 



The System Type menu is getting quite long with platforms and is
inconsistent in handling of sub-arch specific options. Tidy up the menu
by making platform options a menuconfig entry containing any platform
specific config items.

[arnd: change OMAP part according to suggestion from
 Tony Lindgren <tony@atomide.com>]

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 216e9d3e

arch/arm/mach-bcm/Kconfig

+3 −4
Original line number Diff line number Diff line 
config ARCH_BCM

menuconfig ARCH_BCM

	bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7

	help

	  This enables support for Broadcom ARM based SoC chips



menu "Broadcom SoC Selection"

	depends on ARCH_BCM

if ARCH_BCM



config ARCH_BCM_MOBILE

	bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
@@ -88,4 +87,4 @@ config ARCH_BCM_5301X 
	  different SoC or with the older BCM47XX and BCM53XX based

	  network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx



endmenu
 
endif

arch/arm/mach-berlin/Kconfig

+1 −5
Original line number Diff line number Diff line 
config ARCH_BERLIN

menuconfig ARCH_BERLIN

	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARM_GIC
@@ -9,8 +9,6 @@ config ARCH_BERLIN 


if ARCH_BERLIN



menu "Marvell Berlin SoC variants"



config MACH_BERLIN_BG2

	bool "Marvell Armada 1500 (BG2)"

	select CACHE_L2X0
@@ -30,6 +28,4 @@ config MACH_BERLIN_BG2Q 
	select HAVE_ARM_TWD if SMP

	select PINCTRL_BERLIN_BG2Q



endmenu



endif

arch/arm/mach-cns3xxx/Kconfig

+3 −4
Original line number Diff line number Diff line 
config ARCH_CNS3XXX

menuconfig ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6

	select ARM_GIC

	select PCI_DOMAINS if PCI

	help

	  Support for Cavium Networks CNS3XXX platform.



menu "CNS3XXX platform type"

	depends on ARCH_CNS3XXX

if ARCH_CNS3XXX



config MACH_CNS3420VB

	bool "Support for CNS3420 Validation Board"
@@ -17,4 +16,4 @@ config MACH_CNS3420VB 
	  This is a platform with an on-board ARM11 MPCore and has support

	  for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.



endmenu
 
endif

arch/arm/mach-exynos/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


# Configuration options for the EXYNOS4



config ARCH_EXYNOS

menuconfig ARCH_EXYNOS

	bool "Samsung EXYNOS" if ARCH_MULTI_V7

	select ARCH_HAS_BANDGAP

	select ARCH_HAS_HOLES_MEMORYMODEL
@@ -29,8 +29,6 @@ config ARCH_EXYNOS 


if ARCH_EXYNOS



menu "SAMSUNG EXYNOS SoCs Support"



config ARCH_EXYNOS3

	bool "SAMSUNG EXYNOS3"

	select ARM_CPU_SUSPEND if PM
@@ -117,8 +115,6 @@ config SOC_EXYNOS5800 
	default y

	depends on SOC_EXYNOS5420



endmenu



config EXYNOS5420_MCPM

	bool "Exynos5420 Multi-Cluster PM support"

	depends on MCPM && SOC_EXYNOS5420

arch/arm/mach-imx/Kconfig

+3 −4
Original line number Diff line number Diff line 
config ARCH_MXC

menuconfig ARCH_MXC

	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7

	select ARCH_HAS_OPP

	select ARCH_REQUIRE_GPIOLIB
@@ -12,8 +12,7 @@ config ARCH_MXC 
	help

	  Support for Freescale MXC/iMX-based family of processors



menu "Freescale i.MX support"

	depends on ARCH_MXC

if ARCH_MXC



config MXC_TZIC

	bool
@@ -783,4 +782,4 @@ endif 


source "arch/arm/mach-imx/devices/Kconfig"



endmenu
 
endif