ARM: integrator: split board select into AP/CP select and CM select

[oweals/u-boot.git] / arch / arm / mach-integrator / Kconfig

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 440639998927e38592afac88ceec3c9055b9a001..6794660dac28011ca894f33b22e3a15416e4bd8d 100644 (file)
--- 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