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

Commit 64e74aa7 authored by Scott Branden's avatar Scott Branden Committed by Florian Fainelli
Browse files

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: default avatarScott Branden <sbranden@broadcom.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent d318987e

arch/arm/mach-bcm/Kconfig

+10 −16
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ 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



comment "KONA architected SoCs"



config ARCH_BCM_MOBILE

	bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7

	bool

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420
@@ -61,16 +63,13 @@ config ARCH_BCM_MOBILE 
	select TICK_ONESHOT

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL

	select ARCH_BCM_MOBILE_SMP if SMP

	help

	  This enables support for systems based on Broadcom mobile SoCs.



if ARCH_BCM_MOBILE



menu "Broadcom Mobile SoC Selection"



config ARCH_BCM_281XX

	bool "Broadcom BCM281XX SoC family"

	default y

	select ARCH_BCM_MOBILE

	select HAVE_SMP

	help

	  Enable support for the BCM281XX family, which includes
@@ -79,7 +78,7 @@ config ARCH_BCM_281XX 


config ARCH_BCM_21664

	bool "Broadcom BCM21664 SoC family"

	default y

	select ARCH_BCM_MOBILE

	select HAVE_SMP

	help

	  Enable support for the BCM21664 family, which includes
@@ -87,19 +86,18 @@ config ARCH_BCM_21664 


config ARCH_BCM_MOBILE_L2_CACHE

	bool "Broadcom mobile SoC level 2 cache support"

	depends on (ARCH_BCM_281XX || ARCH_BCM_21664)

	depends on ARCH_BCM_MOBILE

	default y

	select CACHE_L2X0

	select ARCH_BCM_MOBILE_SMC



config ARCH_BCM_MOBILE_SMC

	bool

	depends on ARCH_BCM_281XX || ARCH_BCM_21664

	depends on ARCH_BCM_MOBILE



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 ARM_ERRATA_764369

	help
@@ -107,10 +105,6 @@ config ARCH_BCM_MOBILE_SMP 
	  Provided as an option so SMP support for SoCs of this type

	  can be disabled for an SMP-enabled kernel.



endmenu



endif



comment "Other Architectures"



config ARCH_BCM2835