X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Fmach-integrator%2FKconfig;h=c54d69db0e4276a3e4236f24668fa87da20fe153;hb=fffde77e130897124e76108cdcb0ff9246a90a78;hp=440639998927e38592afac88ceec3c9055b9a001;hpb=5cbbd9bd0a5d496dee2b5592bb0c4cdac16bac80;p=u-boot

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 4406399989..c54d69db0e 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -2,40 +2,45 @@ menu "Integrator Options"
 	depends on ARCH_INTEGRATOR
 
 choice
-	prompt "ARM Ltd. Integrator board select"
+	prompt "Integrator platform select"
+	optional
 
-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"
+	select ARCH_CINTEGRATOR
 
-config TARGET_INTEGRATORCP_CM920T
-	bool "Support integratorcp_cm920t"
-	select CPU_ARM920T
+endchoice
 
-config TARGET_INTEGRATORAP_CM926EJS
-	bool "Support integratorap_cm926ejs"
-	select CPU_ARM926EJS
+config ARCH_CINTEGRATOR
+	bool
 
-config TARGET_INTEGRATORCP_CM926EJS
-	bool "Support integratorcp_cm926ejs"
-	select CPU_ARM926EJS
+choice
+	prompt "Integrator core module select"
+	optional
 
-config TARGET_INTEGRATORCP_CM1136
-	bool "Support integratorcp_cm1136"
-	select CPU_ARM1136
+config CM720T
+	bool "Core Module for ARM720T"
+	select CPU_ARM720T
 
-config TARGET_INTEGRATORAP_CM946ES
-	bool "Support integratorap_cm946es"
-	select CPU_ARM946ES
+config CM920T
+	bool "Core Module for ARM920T"
+	select CPU_ARM920T
 
-config TARGET_INTEGRATORCP_CM946ES
-	bool "Support integratorcp_cm946es"
+config CM926EJ_S
+	bool "Core Module for ARM926EJ-STM"
+	select CPU_ARM926EJS
+
+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 +50,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