list ABI first and tweak ISA defaults with suggestions from Jim Gifford

extra/Configs/Config.mips

@@ -18,9 +18,29 @@ config ARCH_CFLAGS
 config LIBGCC_CFLAGS
 	string
 
+choice
+	prompt "Target ABI"
+	default CONFIG_MIPS_O32_ABI
+	help
+	  This is the ABI you wish to build use.  Choose either O32, N32
+	  or N64.
+
+config CONFIG_MIPS_O32_ABI
+	bool "O32 ABI"
+
+config CONFIG_MIPS_N32_ABI
+	bool "N32 ABI"
+
+config CONFIG_MIPS_N64_ABI
+	bool "N64 ABI"
+
+endchoice
+
 choice
 	prompt "Target Processor Architecture"
-	default CONFIG_MIPS_ISA_1
+	default CONFIG_MIPS_ISA_1 if CONFIG_MIPS_O32_ABI
+	default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N32_ABI
+	default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N64_ABI
 	help
 	  This selects the instruction set architecture of your MIPS CPU. This
 	  information is used for optimizing purposes. To build a library that
@@ -54,21 +74,3 @@ config CONFIG_MIPS_ISA_MIPS64
 	bool "MIPS64"
 
 endchoice
-
-choice
-	prompt "Target ABI"
-	default CONFIG_MIPS_O32_ABI
-	help
-	  This is the ABI you wish to build use.  Choose either O32, N32
-	  or N64.
-
-config CONFIG_MIPS_O32_ABI
-	bool "O32 ABI"
-
-config CONFIG_MIPS_N64_ABI
-	bool "N64 ABI"
-
-config CONFIG_MIPS_N32_ABI
-	bool "N32 ABI"
-
-endchoice