diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-04-21 21:59:37 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-23 08:52:27 -0400 |
| commit | 9ef851f890c7ecb42bde06a55781b992224ef442 (patch) | |
| tree | 5728325eb83ec3b1b08effbdc8cbb3ed74c803e4 /arch/arm/mach-integrator | |
| parent | 5cbbd9bd0a5d496dee2b5592bb0c4cdac16bac80 (diff) | |
| download | talos-obmc-uboot-9ef851f890c7ecb42bde06a55781b992224ef442.tar.gz talos-obmc-uboot-9ef851f890c7ecb42bde06a55781b992224ef442.zip | |
ARM: integrator: split board select into AP/CP select and CM select
Select integrator boards by the combination of platform select (AP/CP)
and core module select (CM720T, CM920T, ...).
This allows us to remove CONFIG_SYS_EXTRA_OPTIONS and make Kconfig
much cleaner.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/Kconfig | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 4406399989..6794660dac 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -2,40 +2,39 @@ menu "Integrator Options" depends on ARCH_INTEGRATOR choice - prompt "ARM Ltd. Integrator board select" + prompt "Integrator platform select" -config TARGET_INTEGRATORAP_CM720T - bool "Support integratorap_cm720t" - select CPU_ARM720T +config ARCH_INTEGRATOR_AP + bool "Support Integrator/AP platform" -config TARGET_INTEGRATORAP_CM920T - bool "Support integratorap_cm920t" - select CPU_ARM920T +config ARCH_INTEGRATOR_CP + bool "Support Integrator/CP platform" -config TARGET_INTEGRATORCP_CM920T - bool "Support integratorcp_cm920t" - select CPU_ARM920T +endchoice -config TARGET_INTEGRATORAP_CM926EJS - bool "Support integratorap_cm926ejs" - select CPU_ARM926EJS +choice + prompt "Integrator core module select" -config TARGET_INTEGRATORCP_CM926EJS - bool "Support integratorcp_cm926ejs" - select CPU_ARM926EJS +config CM720T + bool "Core Module for ARM720T" + select CPU_ARM720T -config TARGET_INTEGRATORCP_CM1136 - bool "Support integratorcp_cm1136" - select CPU_ARM1136 +config CM920T + bool "Core Module for ARM920T" + select CPU_ARM920T -config TARGET_INTEGRATORAP_CM946ES - bool "Support integratorap_cm946es" - select CPU_ARM946ES +config CM926EJ_S + bool "Core Module for ARM926EJ-STM" + select CPU_ARM926EJS -config TARGET_INTEGRATORCP_CM946ES - bool "Support integratorcp_cm946es" +config CM946ES + bool "Core Module for ARM946E-STM" select CPU_ARM946ES +config CM1136 + bool "Core Module for ARM1136JF-STM" + select CPU_ARM1136 + endchoice config SYS_BOARD @@ -45,13 +44,7 @@ config SYS_VENDOR default "armltd" config SYS_CONFIG_NAME - default "integratorap" if TARGET_INTEGRATORAP_CM720T || \ - TARGET_INTEGRATORAP_CM920T || \ - TARGET_INTEGRATORAP_CM926EJS || \ - TARGET_INTEGRATORAP_CM946ES - default "integratorcp" if TARGET_INTEGRATORCP_CM920T || \ - TARGET_INTEGRATORCP_CM926EJS || \ - TARGET_INTEGRATORCP_CM946ES || \ - TARGET_INTEGRATORCP_CM1136 + default "integratorap" if ARCH_INTEGRATOR_AP + default "integratorcp" if ARCH_INTEGRATOR_CP endmenu |
