From 9ef851f890c7ecb42bde06a55781b992224ef442 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 21 Apr 2015 21:59:37 +0900 Subject: 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 Cc: Linus Walleij diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 4406399..6794660 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 diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig index 5c15d57..fc0dc67 100644 --- a/configs/integratorap_cm720t_defconfig +++ b/configs/integratorap_cm720t_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM720T" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORAP_CM720T=y +CONFIG_ARCH_INTEGRATOR_AP=y +CONFIG_CM720T=y diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig index d2a9a71..eb6afb9 100644 --- a/configs/integratorap_cm920t_defconfig +++ b/configs/integratorap_cm920t_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM920T" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORAP_CM920T=y +CONFIG_ARCH_INTEGRATOR_AP=y +CONFIG_CM920T=y diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig index af4cfa5..8667fcb 100644 --- a/configs/integratorap_cm926ejs_defconfig +++ b/configs/integratorap_cm926ejs_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM926EJ_S" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORAP_CM926EJS=y +CONFIG_ARCH_INTEGRATOR_AP=y +CONFIG_CM926EJ_S=y diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig index ee07206..1e8c157 100644 --- a/configs/integratorap_cm946es_defconfig +++ b/configs/integratorap_cm946es_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM946ES" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORAP_CM946ES=y +CONFIG_ARCH_INTEGRATOR_AP=y +CONFIG_CM946ES=y diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig index 5deedc8..f039470 100644 --- a/configs/integratorcp_cm1136_defconfig +++ b/configs/integratorcp_cm1136_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM1136" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORCP_CM1136=y +CONFIG_ARCH_INTEGRATOR_CP=y +CONFIG_CM1136=y diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig index 5ed8539..cb364a1 100644 --- a/configs/integratorcp_cm920t_defconfig +++ b/configs/integratorcp_cm920t_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM920T" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORCP_CM920T=y +CONFIG_ARCH_INTEGRATOR_CP=y +CONFIG_CM920T=y diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig index 4840ec4..32ea7b9 100644 --- a/configs/integratorcp_cm926ejs_defconfig +++ b/configs/integratorcp_cm926ejs_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORCP_CM926EJS=y +CONFIG_ARCH_INTEGRATOR_CP=y +CONFIG_CM926EJ_S=y diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig index dcd034d..e7fc706 100644 --- a/configs/integratorcp_cm946es_defconfig +++ b/configs/integratorcp_cm946es_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM946ES" CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_TARGET_INTEGRATORCP_CM946ES=y +CONFIG_ARCH_INTEGRATOR_CP=y +CONFIG_CM946ES=y -- cgit v0.10.2