mips: cleanup and fix mips{32,64}r6 support

uClibc-ng shared library support will be fixed in next
release of uClibc-ng. Preparation fixes for this.

6 files changed, 19 insertions, 4 deletions

diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 13716a355..66a29c609 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -858,6 +858,7 @@ config ADK_TARGET_CPU_MIPS64_MIPS64
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY
+	select ADK_KERNEL_CPU_MIPS64_R1
 	depends on ADK_TARGET_ARCH_MIPS64
 
 config ADK_TARGET_CPU_MIPS64_MIPS64R2
@@ -868,6 +869,7 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R2
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY
+	select ADK_KERNEL_CPU_MIPS64_R2
 	depends on ADK_TARGET_ARCH_MIPS64
 
 config ADK_TARGET_CPU_MIPS64_MIPS64R6
@@ -878,6 +880,7 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R6
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_ARCH_MIPS_WITH_NAN_2008
+	select ADK_KERNEL_CPU_MIPS64_R6
 	depends on ADK_TARGET_ARCH_MIPS64
 
 config ADK_TARGET_CPU_MIPS64_LOONGSON2F
diff --git a/target/linux/config/Config.in.mips b/target/linux/config/Config.in.mips
index fcb380598..400602439 100644
--- a/target/linux/config/Config.in.mips
+++ b/target/linux/config/Config.in.mips
@@ -10,6 +10,15 @@ config ADK_KERNEL_CPU_MIPS32_R2
 config ADK_KERNEL_CPU_MIPS32_R6
 	bool
 
+config ADK_KERNEL_CPU_MIPS64_R1
+	bool
+
+config ADK_KERNEL_CPU_MIPS64_R2
+	bool
+
+config ADK_KERNEL_CPU_MIPS64_R6
+	bool
+
 menu "MIPS devices support"
 depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 6044481fc..3ea5f538b 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -95,6 +95,7 @@ config ADK_KERNEL_SERIAL_8250
 		|| ADK_TARGET_SYSTEM_PCENGINES_ALIX \
 		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
 		|| ADK_TARGET_SYSTEM_QEMU_MIPS \
+		|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
 		|| ADK_TARGET_SYSTEM_SGI_O2 \
 		|| ADK_TARGET_SYSTEM_QEMU_NIOS2 \
 		|| ADK_TARGET_SYSTEM_QEMU_OR1K \
@@ -118,6 +119,7 @@ config ADK_KERNEL_SERIAL_8250
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
 	default y if ADK_TARGET_SYSTEM_SGI_O2
 	default y if ADK_TARGET_SYSTEM_QEMU_NIOS2
 	default y if ADK_TARGET_SYSTEM_QEMU_OR1K
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 48d7e56ac..cc39db1bd 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -17,7 +17,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS}
 QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 
 ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32R6),y)
-QEMU_ARGS+=-cpu mips32r6-generic
+QEMU_ARGS+=-cpu P5600
 endif
 
 # target helper text
diff --git a/target/mips64/Makefile b/target/mips64/Makefile
index 74d281434..ae50d2344 100644
--- a/target/mips64/Makefile
+++ b/target/mips64/Makefile
@@ -12,6 +12,10 @@ QEMU_ARGS:=-M malta
 QEMU_ARGS+=${ADK_QEMU_ARGS}
 QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 
+ifeq ($(ADK_TARGET_CPU_MIPS64_MIPS64R6),y)
+QEMU_ARGS+=-cpu I6400
+endif
+
 # target helper text
 ifeq ($(ADK_TARGET_FS),nfsroot)
 targethelp:
diff --git a/target/mips64/kernel/qemu-mips64 b/target/mips64/kernel/qemu-mips64
index 9216fe380..1c0076b03 100644
--- a/target/mips64/kernel/qemu-mips64
+++ b/target/mips64/kernel/qemu-mips64
@@ -1,9 +1,6 @@
 CONFIG_MIPS=y
 CONFIG_MIPS_MALTA=y
-CONFIG_CPU_MIPS64_R1=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 CONFIG_BINFMT_ELF32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y