csky: rework qemu support

5 files changed, 27 insertions, 18 deletions

diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index 19aaba3b7..cac84f5ba 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -14,7 +14,6 @@ prompt "GCC version"
 depends on ADK_BUILD_COMPILER_GCC
 default ADK_TOOLCHAIN_GCC_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_GCC_AVR32 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_CSKY if ADK_TARGET_ARCH_CSKY
 default ADK_TOOLCHAIN_GCC_LM32 if ADK_TARGET_ARCH_LM32
 default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG
 default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
@@ -66,10 +65,6 @@ config ADK_TOOLCHAIN_GCC_AVR32
 	bool "4.4.7-avr32"
 	depends on ADK_TARGET_ARCH_AVR32
 
-config ADK_TOOLCHAIN_GCC_CSKY
-	bool "6.3.0-csky"
-	depends on ADK_TARGET_ARCH_CSKY
-
 config ADK_TOOLCHAIN_GCC_METAG
 	bool "4.2.4-metag"
 	depends on ADK_TARGET_ARCH_METAG
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 77214193a..d737c96ab 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -440,6 +440,14 @@ config ADK_TARGET_CPU_CSKY_CK807
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
 
+config ADK_TARGET_CPU_CSKY_CK807F
+	bool "ck807f"
+	select ADK_TARGET_SUPPORTS_THREADS
+	select ADK_TARGET_SUPPORTS_NPTL
+	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_CSKY
+
 config ADK_TARGET_CPU_CSKY_CK810
 	bool "ck810"
 	select ADK_TARGET_SUPPORTS_THREADS
@@ -447,6 +455,14 @@ config ADK_TARGET_CPU_CSKY_CK810
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
 
+config ADK_TARGET_CPU_CSKY_CK810F
+	bool "ck810f"
+	select ADK_TARGET_SUPPORTS_THREADS
+	select ADK_TARGET_SUPPORTS_NPTL
+	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_CSKY
+
 # epiphany
 config ADK_TARGET_CPU_EPIPHANY
 	bool "epiphany"
@@ -1869,6 +1885,10 @@ config ADK_TARGET_GCC_CPU
 	default "cortex-m3" if ADK_TARGET_CPU_ARM_CORTEX_M3
 	default "cortex-m4" if ADK_TARGET_CPU_ARM_CORTEX_M4
 	default "cortex-m7" if ADK_TARGET_CPU_ARM_CORTEX_M7
+	default "ck807" if ADK_TARGET_CPU_CSKY_CK807
+	default "ck810" if ADK_TARGET_CPU_CSKY_CK810
+	default "ck807f" if ADK_TARGET_CPU_CSKY_CK807F
+	default "ck810f" if ADK_TARGET_CPU_CSKY_CK810F
 	default "ev4" if ADK_TARGET_CPU_ALPHA_EV4
 	default "ev5" if ADK_TARGET_CPU_ALPHA_EV5
 	default "ev6" if ADK_TARGET_CPU_ALPHA_EV6
@@ -1984,9 +2004,10 @@ config ADK_TARGET_CPU_FLAGS
 	default "-mcpu=bf549m" if ADK_TARGET_CPU_BFIN_BF549M
 	default "-mcpu=bf561" if ADK_TARGET_CPU_BFIN_BF561
 	default "-mcpu=bf592" if ADK_TARGET_CPU_BFIN_BF592
-	default "-mcpu=ck610" if ADK_TARGET_CPU_CSKY_CK610
 	default "-mcpu=ck807" if ADK_TARGET_CPU_CSKY_CK807
 	default "-mcpu=ck810" if ADK_TARGET_CPU_CSKY_CK810
+	default "-mcpu=ck807f" if ADK_TARGET_CPU_CSKY_CK807F
+	default "-mcpu=ck810f" if ADK_TARGET_CPU_CSKY_CK810F
 	default "-mcpu=v10" if ADK_TARGET_CPU_CRIS_CRISV10
 	default "-mcpu=v32" if ADK_TARGET_CPU_CRIS_CRISV32
 	default "-mh" if ADK_TARGET_CPU_H8300H
diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian
index cecc4cd36..2fb382ab9 100644
--- a/target/config/Config.in.endian
+++ b/target/config/Config.in.endian
@@ -17,8 +17,7 @@ depends on ADK_TARGET_SYSTEM_GENERIC_ARC \
 	|| ADK_TARGET_SYSTEM_GENERIC_XTENSA \
 	|| ADK_TARGET_SYSTEM_SYNOPSYS_NSIM \
 	|| ADK_TARGET_SYSTEM_QEMU_AARCH64 \
-	|| ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 \
-	|| ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 \
+	|| ADK_TARGET_SYSTEM_QEMU_CSKY \
 	|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
 	|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS \
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index a2d0516df..fe9a8135a 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -227,7 +227,7 @@ config ADK_TARGET_SUFFIX
 	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_O32
 	default "uclibc32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_32 && ADK_LINUX_64
 	default "uclibcspe" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_PPC && ADK_TARGET_ARCH_PPC_WITH_SPE
-	default "uclibcabiv2" if ADK_TARGET_LIB_UCLIBC_NG && (ADK_TARGET_CPU_CSKY_CK807 || ADK_TARGET_CPU_CSKY_CK810)
+	default "uclibcabiv2" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_CSKY
 	default "uclibc" if ADK_TARGET_LIB_UCLIBC_NG
 	default "musleabihf" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
 	default "musleabi" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 3a708885a..f24af9a6b 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -38,9 +38,7 @@ menu "Qemu system configuration"
 depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \
 				|| ADK_TARGET_SYSTEM_QEMU_RISCV32 \
 				|| ADK_TARGET_SYSTEM_QEMU_RISCV64 \
-				|| ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 \
-				|| ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 \
-				|| ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 \
+				|| ADK_TARGET_SYSTEM_QEMU_CSKY \
 				|| ADK_TARGET_SYSTEM_QEMU_X86 \
 				|| ADK_TARGET_SYSTEM_QEMU_AARCH64 \
 				|| ADK_TARGET_SYSTEM_QEMU_SPARC64)
@@ -98,15 +96,11 @@ depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
 		ADK_TARGET_SYSTEM_QEMU_AARCH64 || \
 		ADK_TARGET_SYSTEM_QEMU_RISCV32 || \
 		ADK_TARGET_SYSTEM_QEMU_RISCV64 || \
-		ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 || \
-		ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 || \
-		ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 || \
+		ADK_TARGET_SYSTEM_QEMU_CSKY || \
 		ADK_TARGET_SYSTEM_QEMU_X86 || \
 		ADK_TARGET_SYSTEM_QEMU_X86_64
 default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64
-default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_CSKY_CK610
-default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_CSKY_CK807
-default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_CSKY_CK810
+default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_CSKY
 default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_RISCV32
 default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_RISCV64