MIPS arch: factorize selection of cores

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

1 files changed, 40 insertions, 72 deletions

diff --git a/kconfig/arch/mips/mips.kconfig b/kconfig/arch/mips/mips.kconfig
index b19f0ba..440a789 100644
--- a/kconfig/arch/mips/mips.kconfig
+++ b/kconfig/arch/mips/mips.kconfig
@@ -24,90 +24,65 @@
 ################################################################################
 
 choice
+	prompt "MIPS Endian"
+	depends on EMBTK_ARCH_MIPS
+	help
+	 Select your MIPS core endianness
+
+	config EMBTK_ARCH_MIPS_LITTLE_ENDIAN
+		bool "Little endian"
+		select EMBTK_TARGET_ARCH_LITTLE_ENDIAN
+
+	config EMBTK_ARCH_MIPS_BIG_ENDIAN
+		bool "Big endian"
+		select EMBTK_TARGET_ARCH_BIG_ENDIAN
+endchoice
+
+choice
 	prompt "MIPS architecture variant"
 	depends on EMBTK_ARCH_MIPS
-	default EMBTK_ARCH_MIPS_MIPS32_LITTLE
+	default EMBTK_ARCH_MIPS_MIPS32
 	help
 	 Select architecture variant.
-	config EMBTK_ARCH_MIPS_MIPS1_LITTLE
-		bool "MIPS I little endian"
-		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_1 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS1_BIG
-		bool "MIPS I big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS1
+		bool "MIPS I core"
 		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_1 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS2_LITTLE
-		bool "MIPS II little endian"
-		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_2 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS2_BIG
-		bool "MIPS II big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS2
+		bool "MIPS II core"
 		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_2 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS3_LITTLE
-		bool "MIPS III little endian"
-		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_3 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS3_BIG
-		bool "MIPS III big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS3
+		bool "MIPS III core"
 		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_3 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS4_LITTLE
-		bool "MIPS IV little endian"
-		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_4 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS4_BIG
-		bool "MIPS IV big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS4
+		bool "MIPS IV core"
 		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_4 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS32_LITTLE
-		bool "MIPS32 little endian"
-		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS32 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS32_BIG
-		bool "MIPS32 big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS32
+		bool "MIPS32 core"
 		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS32 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS32R2_LITTLE
-		bool "MIPS32 release 2 little endian"
-		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS32R2 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS32R2_BIG
-		bool "MIPS32 release 2 big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS32R2
+		bool "MIPS32 release 2 core"
 		select EMBTK_TARGET_ARCH_32BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS32R2 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS64_LITTLE
-		bool "MIPS64 little endian"
-		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS64 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS64_BIG
-		bool "MIPS64 big endian"
-		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
-		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS64 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS64R2_LITTLE
-		bool "MIPS64 release 2 little endian"
+
+	config EMBTK_ARCH_MIPS_MIPS64
+		bool "MIPS64 core"
 		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_LITTLE_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS64 if EMBTK_CLIB_UCLIBC
-	config EMBTK_ARCH_MIPS_MIPS64R2_BIG
-		bool "MIPS64 release 2 big endian"
+
+	config EMBTK_ARCH_MIPS_MIPS64R2
+		bool "MIPS64 release 2 core"
 		select EMBTK_TARGET_ARCH_64BITS
-		select EMBTK_ARCH_MIPS_BIG_ENDIAN
 		select KEMBTK_UCLIBC_CONFIG_MIPS_ISA_MIPS64 if EMBTK_CLIB_UCLIBC
 
 endchoice
@@ -139,10 +114,3 @@ choice
 		select EMBTK_64BITS_FS
 		select KEMBTK_UCLIBC_CONFIG_MIPS_N64_ABI if EMBTK_CLIB_UCLIBC
 endchoice
-
-config EMBTK_ARCH_MIPS_BIG_ENDIAN
-	bool
-	select EMBTK_TARGET_ARCH_BIG_ENDIAN
-config EMBTK_ARCH_MIPS_LITTLE_ENDIAN
-	bool
-	select EMBTK_TARGET_ARCH_LITTLE_ENDIAN