Browse Source

ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig

remove menu "Broadcom Mobile SoC Selection"
This requires:
- selecting ARCH_BCM_MOBILE based on SoC selections
- fixup bcm_defconfig and multi_v7_defconfig to work with new menu levels.

Signed-off-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Scott Branden 10 years ago
parent
commit
64e74aa788
1 changed files with 10 additions and 16 deletions
  1. 10 16
      arch/arm/mach-bcm/Kconfig

+ 10 - 16
arch/arm/mach-bcm/Kconfig

@@ -51,8 +51,10 @@ config ARCH_BCM_5301X
 	  different SoC or with the older BCM47XX and BCM53XX based
 	  different SoC or with the older BCM47XX and BCM53XX based
 	  network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 	  network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 
 
+comment "KONA architected SoCs"
+
 config ARCH_BCM_MOBILE
 config ARCH_BCM_MOBILE
-	bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
+	bool
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_775420
 	select ARM_ERRATA_775420
@@ -61,16 +63,13 @@ config ARCH_BCM_MOBILE
 	select TICK_ONESHOT
 	select TICK_ONESHOT
 	select HAVE_ARM_ARCH_TIMER
 	select HAVE_ARM_ARCH_TIMER
 	select PINCTRL
 	select PINCTRL
+	select ARCH_BCM_MOBILE_SMP if SMP
 	help
 	help
 	  This enables support for systems based on Broadcom mobile SoCs.
 	  This enables support for systems based on Broadcom mobile SoCs.
 
 
-if ARCH_BCM_MOBILE
-
-menu "Broadcom Mobile SoC Selection"
-
 config ARCH_BCM_281XX
 config ARCH_BCM_281XX
 	bool "Broadcom BCM281XX SoC family"
 	bool "Broadcom BCM281XX SoC family"
-	default y
+	select ARCH_BCM_MOBILE
 	select HAVE_SMP
 	select HAVE_SMP
 	help
 	help
 	  Enable support for the BCM281XX family, which includes
 	  Enable support for the BCM281XX family, which includes
@@ -79,7 +78,7 @@ config ARCH_BCM_281XX
 
 
 config ARCH_BCM_21664
 config ARCH_BCM_21664
 	bool "Broadcom BCM21664 SoC family"
 	bool "Broadcom BCM21664 SoC family"
-	default y
+	select ARCH_BCM_MOBILE
 	select HAVE_SMP
 	select HAVE_SMP
 	help
 	help
 	  Enable support for the BCM21664 family, which includes
 	  Enable support for the BCM21664 family, which includes
@@ -87,19 +86,18 @@ config ARCH_BCM_21664
 
 
 config ARCH_BCM_MOBILE_L2_CACHE
 config ARCH_BCM_MOBILE_L2_CACHE
 	bool "Broadcom mobile SoC level 2 cache support"
 	bool "Broadcom mobile SoC level 2 cache support"
-	depends on (ARCH_BCM_281XX || ARCH_BCM_21664)
+	depends on ARCH_BCM_MOBILE
 	default y
 	default y
 	select CACHE_L2X0
 	select CACHE_L2X0
 	select ARCH_BCM_MOBILE_SMC
 	select ARCH_BCM_MOBILE_SMC
 
 
 config ARCH_BCM_MOBILE_SMC
 config ARCH_BCM_MOBILE_SMC
 	bool
 	bool
-	depends on ARCH_BCM_281XX || ARCH_BCM_21664
+	depends on ARCH_BCM_MOBILE
 
 
 config ARCH_BCM_MOBILE_SMP
 config ARCH_BCM_MOBILE_SMP
-	bool "Broadcom mobile SoC SMP support"
-	depends on (ARCH_BCM_281XX || ARCH_BCM_21664) && SMP
-	default y
+	bool
+	depends on ARCH_BCM_MOBILE
 	select HAVE_ARM_SCU
 	select HAVE_ARM_SCU
 	select ARM_ERRATA_764369
 	select ARM_ERRATA_764369
 	help
 	help
@@ -107,10 +105,6 @@ config ARCH_BCM_MOBILE_SMP
 	  Provided as an option so SMP support for SoCs of this type
 	  Provided as an option so SMP support for SoCs of this type
 	  can be disabled for an SMP-enabled kernel.
 	  can be disabled for an SMP-enabled kernel.
 
 
-endmenu
-
-endif
-
 comment "Other Architectures"
 comment "Other Architectures"
 
 
 config ARCH_BCM2835
 config ARCH_BCM2835