summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-berlin
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-06-10 09:06:10 -0500
committerArnd Bergmann <arnd@arndb.de>2014-06-17 17:09:48 +0200
commit21278aeafbfacfd62b3e613525f0c694a029dac1 (patch)
treef4d8ea51d28089d09c48ecb4f40bde90a151d721 /arch/arm/mach-berlin
parent216e9d3e8b00424c13ca76ef97d707ddc7f57a8b (diff)
downloadlinux-21278aeafbfacfd62b3e613525f0c694a029dac1.tar.gz
linux-21278aeafbfacfd62b3e613525f0c694a029dac1.tar.bz2
linux-21278aeafbfacfd62b3e613525f0c694a029dac1.zip
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: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-berlin')
-rw-r--r--arch/arm/mach-berlin/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 101e0f356730..2631cfc5ab0d 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -1,4 +1,4 @@
-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