ARM: split which core to use in multiple choices entries

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

1 files changed, 68 insertions, 53 deletions

diff --git a/kconfig/arch-variant-arm.kconfig b/kconfig/arch-variant-arm.kconfig
index 2f3e988..3e5b29c 100644
--- a/kconfig/arch-variant-arm.kconfig
+++ b/kconfig/arch-variant-arm.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -80,150 +80,165 @@ choice
 endchoice
 
 choice
-	prompt "ARM core"
-	depends on EMBTK_ARCH_ARM
+	prompt "ARM arm7tdmi core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
+	help
+		Please choose which arm7tdmi core you want to use.
 
-#### arm7tdmi MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7TDMI
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
 		bool "arm7tdmi"
 	config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7TDMI-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
 		bool "arm7tdmi-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM710T
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
 		bool "arm710t"
 	config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM720T
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
 		bool "arm720t"
 	config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM740T
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
 		bool "arm740t"
 #	config EMBTK_ARCH_ARM_FAMILY_ARM7TDMI_ARM7EJ-S
-#		depends on EMBTK_ARCH_ARM_FAMILY_ARM7TDMI
 #		bool "arm7ej-s"
+endchoice
+
+choice
+	prompt "StrongARM core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_STRONGARM
+	help
+		Please choose which StrongARM core you want to use.
 
-#### StrongARM MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA
-		depends on EMBTK_ARCH_ARM_FAMILY_STRONGARM
 		bool "strongarm"
 	config EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA-110
-		depends on EMBTK_ARCH_ARM_FAMILY_STRONGARM
 		bool "strongarm110"
 	config EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA-1100
-		depends on EMBTK_ARCH_ARM_FAMILY_STRONGARM
 		bool "strongarm1100"
 	config EMBTK_ARCH_ARM_FAMILY_STRONGARM_SA-1110
-		depends on EMBTK_ARCH_ARM_FAMILY_STRONGARM
 		bool "strongarm1110"
+endchoice
+
+choice
+	prompt "ARM arm8 core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_ARM8
+	help
+		Please choose which arm8 core you want to use.
 
-#### ARM8 MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_ARM8_ARM810
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM8
 		bool "arm810"
+endchoice
+
+choice
+	prompt "ARM arm9tdmi core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_ARM9TDMI
+	help
+		Please choose which arm9tdmi core you want to use.
 
-#### ARM9TDMI MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM9TDMI
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9TDMI
 		bool "arm9tdmi"
 	config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM920T
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9TDMI
 		bool "arm920t"
 	config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM922T
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9TDMI
 		bool "arm922t"
 	config EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM940T
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9TDMI
 		bool "arm940t"
+endchoice
+
+choice
+	prompt "ARM arm9e core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_ARM9E
+	help
+		Please choose which arm9e core you want to use.
 
-#### ARM9E MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM946E-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9E
 		bool "arm946e-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM966E-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9E
 		bool "arm966e-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM968E-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9E
 		bool "arm968e-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM926EJ-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM9E
 		bool "arm926ej-s"
 #	config EMBTK_ARCH_ARM_FAMILY_ARM9E_ARM996HS
-#		depends on EMBTK_ARCH_ARM_FAMILY_ARM9E
 #		bool "arm996hs"
+endchoice
+
+choice
+	prompt "ARM arm10e core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_ARM10E
+	help
+		Please choose which arm10e core you want to use.
 
-#### ARM10E MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_ARM10E_ARM1020E
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM10E
 		bool "arm1020e"
 	config EMBTK_ARCH_ARM_FAMILY_ARM10E_ARM1022E
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM10E
 		bool "arm1022e"
 	config EMBTK_ARCH_ARM_FAMILY_ARM10E_ARM1026EJ-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM10E
 		bool "arm1026ej-s"
+endchoice
+
+choice
+	prompt "ARM xscale core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_XSCALE
+	help
+		Please choose which xscale core you want to use.
 
-#### XSCALE MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_XSCALE_XSCALE
-		depends on EMBTK_ARCH_ARM_FAMILY_XSCALE
 		bool "xscale"
+endchoice
+
+choice
+	prompt "ARM arm11 core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_ARM11
+	help
+		Please choose which arm11 core you want to use.
 
-#### ARM11 MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1136J-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 		bool "arm1136j-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1136JF-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 		bool "arm1136jf-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1156T2-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 		bool "arm1156t2-s"
 #	config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1156T2F-S
-#		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 #		bool "arm1156t2f-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1176JZ-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 		bool "arm1176jz-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM11_ARM1176JZF-S
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 		bool "arm1176jzf-s"
 	config EMBTK_ARCH_ARM_FAMILY_ARM11_MPCORE
-		depends on EMBTK_ARCH_ARM_FAMILY_ARM11
 		bool "mpcore"
+endchoice
+
+choice
+	prompt "ARM cortex core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
+	help
+		Please choose which cortex core you want to use.
 
-#### CORTEX MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A8
-		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 		bool "cortex-a8"
 	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A9
-		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 		bool "cortex-a9"
 #	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-A9_MPCORE
-#		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 #		bool "cortex-a9 mpcore"
 	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-R4
-		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 		bool "cortex-r4"
 	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-R4F
-		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 		bool "cortex-r4f"
 	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M3
-		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 		bool "cortex-m3"
 #	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M0
 #		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 #		bool "cortex-m0"
 	config EMBTK_ARCH_ARM_FAMILY_CORTEX_CORTEX-M1
-		depends on EMBTK_ARCH_ARM_FAMILY_CORTEX
 		bool "cortex-m1"
+endchoice
+
+choice
+	prompt "ARM iwmmxt core in the target"
+	depends on EMBTK_ARCH_ARM_FAMILY_IWMMXT
+	help
+		Please choose which iwmmxt core you want to use.
 
-#### IWMMXT MCU Family ####
 	config EMBTK_ARCH_ARM_FAMILY_IWMMXT_IWMMXT
-		depends on EMBTK_ARCH_ARM_FAMILY_IWMMXT
 		bool "iwmmxt"
 	config EMBTK_ARCH_ARM_FAMILY_IWMMXT_IWMMXT2
-		depends on EMBTK_ARCH_ARM_FAMILY_IWMMXT
 		bool "iwmmxt2"
 endchoice