korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 20:04:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: use menuconfig for sub-arch menus

Browse Source 
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>
This commit is contained in:
Rob Herring 2014-06-10 09:06:10 -05:00 committed by Arnd Bergmann
parent 216e9d3e8b
commit 21278aeafb
17 changed files with 33 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-bcm/Kconfig
View File

@ -1,10 +1,9 @@
config ARCH_BCM menuconfig ARCH_BCM
bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7 bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
help help
This enables support for Broadcom ARM based SoC chips This enables support for Broadcom ARM based SoC chips
menu "Broadcom SoC Selection" if ARCH_BCM
depends on ARCH_BCM
config ARCH_BCM_MOBILE config ARCH_BCM_MOBILE
bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7 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 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
endmenu endif

6
arch/arm/mach-berlin/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_BERLIN menuconfig ARCH_BERLIN
bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_GIC select ARM_GIC
@ -9,8 +9,6 @@ config ARCH_BERLIN
if ARCH_BERLIN if ARCH_BERLIN
menu "Marvell Berlin SoC variants"
config MACH_BERLIN_BG2 config MACH_BERLIN_BG2
bool "Marvell Armada 1500 (BG2)" bool "Marvell Armada 1500 (BG2)"
select CACHE_L2X0 select CACHE_L2X0
@ -30,6 +28,4 @@ config MACH_BERLIN_BG2Q
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select PINCTRL_BERLIN_BG2Q select PINCTRL_BERLIN_BG2Q
endmenu
endif endif

7
arch/arm/mach-cns3xxx/Kconfig
View File

@ -1,12 +1,11 @@
config ARCH_CNS3XXX menuconfig ARCH_CNS3XXX
bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
select ARM_GIC select ARM_GIC
select PCI_DOMAINS if PCI select PCI_DOMAINS if PCI
help help
Support for Cavium Networks CNS3XXX platform. Support for Cavium Networks CNS3XXX platform.
menu "CNS3XXX platform type" if ARCH_CNS3XXX
depends on ARCH_CNS3XXX
config MACH_CNS3420VB config MACH_CNS3420VB
bool "Support for CNS3420 Validation Board" 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 This is a platform with an on-board ARM11 MPCore and has support
for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc. for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
endmenu endif

6
arch/arm/mach-exynos/Kconfig
View File

@ -7,7 +7,7 @@
# Configuration options for the EXYNOS4 # Configuration options for the EXYNOS4
config ARCH_EXYNOS menuconfig ARCH_EXYNOS
bool "Samsung EXYNOS" if ARCH_MULTI_V7 bool "Samsung EXYNOS" if ARCH_MULTI_V7
select ARCH_HAS_BANDGAP select ARCH_HAS_BANDGAP
select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_HOLES_MEMORYMODEL
@ -29,8 +29,6 @@ config ARCH_EXYNOS
if ARCH_EXYNOS if ARCH_EXYNOS
menu "SAMSUNG EXYNOS SoCs Support"
config ARCH_EXYNOS3 config ARCH_EXYNOS3
bool "SAMSUNG EXYNOS3" bool "SAMSUNG EXYNOS3"
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
@ -117,8 +115,6 @@ config SOC_EXYNOS5800
default y default y
depends on SOC_EXYNOS5420 depends on SOC_EXYNOS5420
endmenu
config EXYNOS5420_MCPM config EXYNOS5420_MCPM
bool "Exynos5420 Multi-Cluster PM support" bool "Exynos5420 Multi-Cluster PM support"
depends on MCPM && SOC_EXYNOS5420 depends on MCPM && SOC_EXYNOS5420

7
arch/arm/mach-imx/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_MXC menuconfig ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
@ -12,8 +12,7 @@ config ARCH_MXC
help help
Support for Freescale MXC/iMX-based family of processors Support for Freescale MXC/iMX-based family of processors
menu "Freescale i.MX support" if ARCH_MXC
depends on ARCH_MXC
config MXC_TZIC config MXC_TZIC
bool bool
@ -783,4 +782,4 @@ endif
source "arch/arm/mach-imx/devices/Kconfig" source "arch/arm/mach-imx/devices/Kconfig"
endmenu endif

2
arch/arm/mach-moxart/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_MOXART menuconfig ARCH_MOXART
bool "MOXA ART SoC" if ARCH_MULTI_V4 bool "MOXA ART SoC" if ARCH_MULTI_V4
select CPU_FA526 select CPU_FA526
select ARM_DMA_MEM_BUFFERABLE select ARM_DMA_MEM_BUFFERABLE

6
arch/arm/mach-mvebu/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_MVEBU menuconfig ARCH_MVEBU
bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5) bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select CLKSRC_MMIO select CLKSRC_MMIO
@ -13,8 +13,6 @@ config ARCH_MVEBU
if ARCH_MVEBU if ARCH_MVEBU
menu "Marvell EBU SoC variants"
config MACH_MVEBU_V7 config MACH_MVEBU_V7
bool bool
select ARMADA_370_XP_TIMER select ARMADA_370_XP_TIMER
@ -96,6 +94,4 @@ config MACH_KIRKWOOD
Say 'Y' here if you want your kernel to support boards based Say 'Y' here if you want your kernel to support boards based
on the Marvell Kirkwood device tree. on the Marvell Kirkwood device tree.
endmenu
endif endif

4
arch/arm/mach-nomadik/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_NOMADIK menuconfig ARCH_NOMADIK
bool "ST-Ericsson Nomadik" bool "ST-Ericsson Nomadik"
depends on ARCH_MULTI_V5 depends on ARCH_MULTI_V5
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
@ -15,7 +15,6 @@ config ARCH_NOMADIK
Support for the Nomadik platform by ST-Ericsson Support for the Nomadik platform by ST-Ericsson
if ARCH_NOMADIK if ARCH_NOMADIK
menu "Nomadik boards"
config MACH_NOMADIK_8815NHK config MACH_NOMADIK_8815NHK
bool "ST 8815 Nomadik Hardware Kit (evaluation board)" bool "ST 8815 Nomadik Hardware Kit (evaluation board)"
@ -24,7 +23,6 @@ config MACH_NOMADIK_8815NHK
select I2C_ALGOBIT select I2C_ALGOBIT
select I2C_NOMADIK select I2C_NOMADIK
endmenu
endif endif
config NOMADIK_8815 config NOMADIK_8815

5
arch/arm/mach-omap2/Kconfig
View File

@ -1,3 +1,6 @@
menu "TI OMAP/AM/DM/DRA Family"
depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
config ARCH_OMAP config ARCH_OMAP
bool bool
@ -341,3 +344,5 @@ config OMAP4_ERRATA_I688
endmenu endmenu
endif endif
endmenu

6
arch/arm/mach-prima2/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_SIRF menuconfig ARCH_SIRF
bool "CSR SiRF" if ARCH_MULTI_V7 bool "CSR SiRF" if ARCH_MULTI_V7
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
@ -11,7 +11,7 @@ config ARCH_SIRF
if ARCH_SIRF if ARCH_SIRF
menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features" comment "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
config ARCH_ATLAS6 config ARCH_ATLAS6
bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform" bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
@ -37,8 +37,6 @@ config ARCH_MARCO
help help
Support for CSR SiRFSoC ARM Cortex A9 Platform Support for CSR SiRFSoC ARM Cortex A9 Platform
endmenu
config SIRF_IRQ config SIRF_IRQ
bool bool

6
arch/arm/mach-qcom/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_QCOM menuconfig ARCH_QCOM
bool "Qualcomm Support" if ARCH_MULTI_V7 bool "Qualcomm Support" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_GIC select ARM_GIC
@ -11,8 +11,6 @@ config ARCH_QCOM
if ARCH_QCOM if ARCH_QCOM
menu "Qualcomm SoC Selection"
config ARCH_MSM8X60 config ARCH_MSM8X60
bool "Enable support for MSM8X60" bool "Enable support for MSM8X60"
select CLKSRC_QCOM select CLKSRC_QCOM
@ -25,8 +23,6 @@ config ARCH_MSM8974
bool "Enable support for MSM8974" bool "Enable support for MSM8974"
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
endmenu
config QCOM_SCM config QCOM_SCM
bool bool

4
arch/arm/mach-shmobile/Kconfig
View File

@ -1,7 +1,7 @@
config ARCH_SHMOBILE config ARCH_SHMOBILE
bool bool
config ARCH_SHMOBILE_MULTI menuconfig ARCH_SHMOBILE_MULTI
bool "Renesas ARM SoCs" if ARCH_MULTI_V7 bool "Renesas ARM SoCs" if ARCH_MULTI_V7
depends on MMU depends on MMU
select ARCH_SHMOBILE select ARCH_SHMOBILE
@ -15,7 +15,7 @@ config ARCH_SHMOBILE_MULTI
if ARCH_SHMOBILE_MULTI if ARCH_SHMOBILE_MULTI
comment "Renesas ARM SoCs System Type" #comment "Renesas ARM SoCs System Type"
config ARCH_EMEV2 config ARCH_EMEV2
bool "Emma Mobile EV2" bool "Emma Mobile EV2"

2
arch/arm/mach-sti/Kconfig
View File

@ -1,5 +1,5 @@
menuconfig ARCH_STI menuconfig ARCH_STI
bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7 bool "STMicroelectronics Consumer Electronics SOCs" if ARCH_MULTI_V7
select ARM_GIC select ARM_GIC
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
select PINCTRL select PINCTRL

7
arch/arm/mach-tegra/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_TEGRA menuconfig ARCH_TEGRA
bool "NVIDIA Tegra" if ARCH_MULTI_V7 bool "NVIDIA Tegra" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
@ -15,8 +15,7 @@ config ARCH_TEGRA
help help
This enables support for NVIDIA Tegra based systems. This enables support for NVIDIA Tegra based systems.
menu "NVIDIA Tegra options" if ARCH_TEGRA
depends on ARCH_TEGRA
config ARCH_TEGRA_2x_SOC config ARCH_TEGRA_2x_SOC
bool "Enable support for Tegra20 family" bool "Enable support for Tegra20 family"
@ -68,4 +67,4 @@ config TEGRA_AHB
which controls AHB bus master arbitration and some which controls AHB bus master arbitration and some
performance parameters(priority, prefech size). performance parameters(priority, prefech size).
endmenu endif

6
arch/arm/mach-u300/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_U300 menuconfig ARCH_U300
bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5 bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5
depends on MMU depends on MMU
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
@ -16,8 +16,6 @@ config ARCH_U300
if ARCH_U300 if ARCH_U300
menu "ST-Ericsson AB U300/U335 Platform"
config MACH_U300 config MACH_U300
depends on ARCH_U300 depends on ARCH_U300
bool "U300" bool "U300"
@ -43,6 +41,4 @@ config MACH_U300_SPIDUMMY
you don't need it. Selecting this will activate the you don't need it. Selecting this will activate the
SPI framework and ARM PL022 support. SPI framework and ARM PL022 support.
endmenu
endif endif

6
arch/arm/mach-ux500/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_U8500 menuconfig ARCH_U8500
bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7 bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
depends on MMU depends on MMU
select AB8500_CORE select AB8500_CORE
@ -33,8 +33,6 @@ config UX500_SOC_DB8500
select REGULATOR select REGULATOR
select REGULATOR_DB8500_PRCMU select REGULATOR_DB8500_PRCMU
menu "Ux500 target platform (boards)"
config MACH_MOP500 config MACH_MOP500
bool "U8500 Development platform, MOP500 versions" bool "U8500 Development platform, MOP500 versions"
select I2C select I2C
@ -67,8 +65,6 @@ config UX500_AUTO_PLATFORM
a working kernel. If everything else is disabled, this a working kernel. If everything else is disabled, this
automatically enables MACH_MOP500. automatically enables MACH_MOP500.
endmenu
config UX500_DEBUG_UART config UX500_DEBUG_UART
int "Ux500 UART to use for low-level debug" int "Ux500 UART to use for low-level debug"
default 2 default 2

7
arch/arm/mach-vexpress/Kconfig
View File

@ -1,4 +1,4 @@
config ARCH_VEXPRESS menuconfig ARCH_VEXPRESS
bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7 bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
@ -37,8 +37,7 @@ config ARCH_VEXPRESS
platforms. The traditional (ATAGs) boot method is not usable on platforms. The traditional (ATAGs) boot method is not usable on
these boards with this option. these boards with this option.
menu "Versatile Express platform type" if ARCH_VEXPRESS
depends on ARCH_VEXPRESS
config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
bool "Enable A5 and A9 only errata work-arounds" bool "Enable A5 and A9 only errata work-arounds"
@ -82,4 +81,4 @@ config ARCH_VEXPRESS_TC2_PM
Support for CPU and cluster power management on Versatile Express Support for CPU and cluster power management on Versatile Express
with a TC2 (A15x2 A7x3) big.LITTLE core tile. with a TC2 (A15x2 A7x3) big.LITTLE core tile.
endmenu endif