Index: target/Config.in.arch
===================================================================
--- target/Config.in.arch	(revision 20212)
+++ target/Config.in.arch	(working copy)
@@ -146,24 +146,25 @@
 	bool "mips 32r2"
 config BR2_mips_64
 	bool "mips 64"
-config BR2_mips_16
-	bool "mips 16"
+config BR2_mips_64r2
+	bool "mips 64r2"
 endchoice
 
 
 choice
 	prompt "Target ABI"
 	depends BR2_mips || BR2_mipsel
-	default BR2_MIPS_EABI
+	default BR_mips_ABI_O32 if BR_mips_32 || BR_mips_32r2
+	default BR_mips_ABI_N32 if BR_mips_64 || BR_mips_64r2
 	help
 	  Application Binary Interface to use
 
-config BR2_MIPS_OABI
-	bool "OABI"
-config BR2_MIPS_EABI
-	bool "EABI"
-config BR2_MIPS_ABI64
-	bool "N64"
+config BR2_MIPS_ABI_O32
+	bool "o32"
+config BR2_MIPS_ABI_N32
+	bool "n32"
+config BR2_MIPS_ABI_N64
+	bool "n64"
 endchoice
 
 choice
@@ -587,7 +588,7 @@
 	default mips32		if BR2_mips_32
 	default mips32r2	if BR2_mips_32r2
 	default mips64		if BR2_mips_64
-	default mips16		if BR2_mips_16
+	default mips64r2	if BR2_mips_64r2
 	default 401		if BR2_powerpc_401
 	default 403		if BR2_powerpc_403
 	default 405		if BR2_powerpc_405
@@ -687,11 +688,9 @@
 	default aapcs		if BR2_arm_dunno
 	default aapcs-linux	if BR2_arm_dunno
 	default iwmmxt		if BR2_iwmmxt
-	default 32		if BR2_mipsel && BR2_MIPS_OABI
-	default n32		if BR2_mipsel && BR2_MIPS_EABI
-	default o64		if BR2_mips && BR2_MIPS_OABI
-	default eabi		if BR2_mips && BR2_MIPS_EABI
-	default 64		if BR2_mips && BR2_MIPS_ABI64
+	default 32		if BR2_MIPS_ABI_O32
+	default n32		if BR2_MIPS_ABI_N32
+	default 64		if BR2_MIPS_ABI_N64
 	default mmixware	if BR2_mmix && BR2_MMIX_ABI_native
 	default gnu		if BR2_mmix && !BR2_MMIX_ABI_native
 	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec
