4 files changed, 71 insertions, 10 deletions

diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 508ed0b90..002d39a70 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -552,6 +552,12 @@ config ADK_CPU_MIPS32R2
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_FPU
 
+config ADK_CPU_MIPS32R6
+	bool
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU
+
 config ADK_CPU_MIPS64
 	bool
 	select ADK_LINUX_64
@@ -564,6 +570,12 @@ config ADK_CPU_MIPS64R2
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
+config ADK_CPU_MIPS64R6
+	bool
+	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+
 config ADK_CPU_MICROBLAZE
 	bool
 	select ADK_TARGET_WITHOUT_THREADS if ADK_TARGET_LIB_UCLIBC_NG
@@ -796,8 +808,10 @@ config ADK_TARGET_GCC_ARCH
 	default "loongson2f" if ADK_CPU_LOONGSON2F
 	default "mips32" if ADK_CPU_MIPS32
 	default "mips32r2" if ADK_CPU_MIPS32R2
+	default "mips32r6" if ADK_CPU_MIPS32R6
 	default "mips64" if ADK_CPU_MIPS64
 	default "mips64r2" if ADK_CPU_MIPS64R2
+	default "mips64r6" if ADK_CPU_MIPS64R6
 	default "nocona" if ADK_CPU_NOCONA
 	default "pentium-m" if ADK_CPU_PENTIUM_M
 	default "x86-64" if ADK_CPU_X86_64
diff --git a/target/config/Config.in.mips b/target/config/Config.in.mips
index 814784ba5..20f020731 100644
--- a/target/config/Config.in.mips
+++ b/target/config/Config.in.mips
@@ -3,7 +3,12 @@
 
 choice ADK_TARGET_MIPS_CPU_ARCH
 prompt "ISA configuration"
-depends on ADK_TARGET_ARCH_MIPS
+depends on ADK_TARGET_ARCH_MIPS && !ADK_TARGET_TOOLCHAIN
+default ADK_CPU_MIPS_MIPS32R2
+
+config ADK_CPU_MIPS_MIPS32R6
+        bool "MIPS32r6"
+        select ADK_CPU_MIPS32R6
 
 config ADK_CPU_MIPS_MIPS32R2
         bool "MIPS32r2"
@@ -14,3 +19,22 @@ config ADK_CPU_MIPS_MIPS32
         select ADK_CPU_MIPS32
 
 endchoice
+
+choice ADK_TARGET_MIPS64_CPU_ARCH
+prompt "ISA configuration"
+depends on ADK_TARGET_ARCH_MIPS64 && !ADK_TARGET_TOOLCHAIN
+default ADK_CPU_MIPS_MIPS64R2
+
+config ADK_CPU_MIPS_MIPS64R6
+        bool "MIPS64r6"
+        select ADK_CPU_MIPS32R6
+
+config ADK_CPU_MIPS_MIPS64R2
+        bool "MIPS64r2"
+        select ADK_CPU_MIPS64R2
+
+config ADK_CPU_MIPS_MIPS64
+        bool "MIPS64"
+        select ADK_CPU_MIPS64
+
+endchoice
diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc
index 810822e47..23a77b566 100644
--- a/target/config/Config.in.tc
+++ b/target/config/Config.in.tc
@@ -10,6 +10,8 @@ depends on (ADK_TARGET_TOOLCHAIN || ADK_TARGET_SIM) && \
 	|| ADK_TARGET_ARCH_ARM \
 	|| ADK_TARGET_ARCH_BFIN \
 	|| ADK_TARGET_ARCH_M68K \
+	|| ADK_TARGET_ARCH_MIPS \
+	|| ADK_TARGET_ARCH_MIPS64 \
 	|| ADK_TARGET_ARCH_SH \
 	|| ADK_TARGET_ARCH_X86 )
 
@@ -415,6 +417,36 @@ config ADK_TARGET_CPU_M68K_68060
 	select ADK_CPU_68060
 	depends on ADK_TARGET_ARCH_M68K
 
+config ADK_TARGET_CPU_MIPS_MIPS32
+	bool "mips32"
+	select ADK_CPU_MIPS32
+	depends on ADK_TARGET_ARCH_MIPS
+
+config ADK_TARGET_CPU_MIPS_MIPS32R2
+	bool "mips32r2"
+	select ADK_CPU_MIPS32R2
+	depends on ADK_TARGET_ARCH_MIPS
+
+config ADK_TARGET_CPU_MIPS_MIPS32R6
+	bool "mips32r6"
+	select ADK_CPU_MIPS32R6
+	depends on ADK_TARGET_ARCH_MIPS
+
+config ADK_TARGET_CPU_MIPS_MIPS64
+	bool "mips64"
+	select ADK_CPU_MIPS64
+	depends on ADK_TARGET_ARCH_MIPS64
+
+config ADK_TARGET_CPU_MIPS_MIPS64R2
+	bool "mips64r2"
+	select ADK_CPU_MIPS64R2
+	depends on ADK_TARGET_ARCH_MIPS64
+
+config ADK_TARGET_CPU_MIPS_MIPS64R6
+	bool "mips64r6"
+	select ADK_CPU_MIPS64R6
+	depends on ADK_TARGET_ARCH_MIPS64
+
 config ADK_TARGET_CPU_SH_SH2
 	bool "sh2"
 	select ADK_CPU_SH2
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 1310f0fd4..607b3c3a9 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -102,15 +102,6 @@ config ADK_KERNEL_64BIT
 	bool
 	default y if ADK_LINUX_64
 
-config ADK_KERNEL_CPU_MIPS64
-	bool
-
-config ADK_KERNEL_CPU_MIPS64_R1
-	bool
-
-config ADK_KERNEL_CPU_MIPS64_R2
-	bool
-
 # ARM specific
 config ADK_KERNEL_AEABI
 	bool