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>

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
+config ARCH_INTEGRATOR_AP
-	bool "Support integratorap_cm720t"
+	bool "Support Integrator/AP platform"
+
+config ARCH_INTEGRATOR_CP
+	bool "Support Integrator/CP platform"
+
+endchoice
+
+choice
+	prompt "Integrator core module select"
+
+config CM720T
+	bool "Core Module for ARM720T"
 	select CPU_ARM720T
 
-config TARGET_INTEGRATORAP_CM920T
+config CM920T
-	bool "Support integratorap_cm920t"
+	bool "Core Module for ARM920T"
 	select CPU_ARM920T
 
-config TARGET_INTEGRATORCP_CM920T
+config CM926EJ_S
-	bool "Support integratorcp_cm920t"
+	bool "Core Module for ARM926EJ-STM"
-	select CPU_ARM920T
-
-config TARGET_INTEGRATORAP_CM926EJS
-	bool "Support integratorap_cm926ejs"
 	select CPU_ARM926EJS
 
-config TARGET_INTEGRATORCP_CM926EJS
+config CM946ES
-	bool "Support integratorcp_cm926ejs"
+	bool "Core Module for ARM946E-STM"
-	select CPU_ARM926EJS
+	select CPU_ARM946ES
 
-config TARGET_INTEGRATORCP_CM1136
+config CM1136
-	bool "Support integratorcp_cm1136"
+	bool "Core Module for ARM1136JF-STM"
 	select CPU_ARM1136
 
-config TARGET_INTEGRATORAP_CM946ES
-	bool "Support integratorap_cm946es"
-	select CPU_ARM946ES
-
-config TARGET_INTEGRATORCP_CM946ES
-	bool "Support integratorcp_cm946es"
-	select CPU_ARM946ES
-
 endchoice
 
 config SYS_BOARD
@@ -45,13 +44,7 @@ config SYS_VENDOR
 	default "armltd"
 
 config SYS_CONFIG_NAME
-	default "integratorap" if TARGET_INTEGRATORAP_CM720T || \
+	default "integratorap" if ARCH_INTEGRATOR_AP
-				  TARGET_INTEGRATORAP_CM920T || \
+	default "integratorcp" if ARCH_INTEGRATOR_CP
-				  TARGET_INTEGRATORAP_CM926EJS || \
-				  TARGET_INTEGRATORAP_CM946ES
-	default "integratorcp" if TARGET_INTEGRATORCP_CM920T || \
-				  TARGET_INTEGRATORCP_CM926EJS || \
-				  TARGET_INTEGRATORCP_CM946ES || \
-				  TARGET_INTEGRATORCP_CM1136
 
 endmenu

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

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

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

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

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

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

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

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