浏览代码

csky: add different qemu configs for the different targets

Waldemar Brodkorb 6 年之前
父节点
当前提交
9adfefa349

+ 4 - 4
target/config/Config.in.cpu

@@ -498,8 +498,8 @@ config ADK_TARGET_CPU_CSKY_CK610
 	depends on ADK_TARGET_ARCH_CSKY
 	depends on ADK_TARGET_LITTLE_ENDIAN
 
-config ADK_TARGET_CPU_CSKY_CK810F
-	bool "ck810f"
+config ADK_TARGET_CPU_CSKY_CK807F
+	bool "ck807f"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_SUPPORTS_NPTL
@@ -508,8 +508,8 @@ config ADK_TARGET_CPU_CSKY_CK810F
 	depends on ADK_TARGET_ARCH_CSKY
 	depends on ADK_TARGET_LITTLE_ENDIAN
 
-config ADK_TARGET_CPU_CSKY_CK807F
-	bool "ck807f"
+config ADK_TARGET_CPU_CSKY_CK810F
+	bool "ck810f"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_SUPPORTS_NPTL

+ 7 - 1
target/csky/Makefile

@@ -8,9 +8,15 @@ include $(ADK_TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_CPU_CSKY_CK610),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK610),y)
 QEMU:=qemu-system-cskyv1
 endif
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK807F),y)
+QEMU:=qemu-system-cskyv2
+endif
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK810F),y)
+QEMU:=qemu-system-cskyv2
+endif
 
 # target helper text
 ifeq ($(ADK_TARGET_FS),archive)

+ 1 - 0
target/csky/kernel/qemu-csky → target/csky/kernel/qemu-csky-ck610

@@ -1,2 +1,3 @@
 CONFIG_CSKY=y
+CONFIG_CPU_CK610=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y

+ 3 - 0
target/csky/kernel/qemu-csky-ck807f

@@ -0,0 +1,3 @@
+CONFIG_CSKY=y
+CONFIG_CPU_CK807=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y

+ 4 - 0
target/csky/kernel/qemu-csky-ck810f

@@ -0,0 +1,4 @@
+CONFIG_CSKY=y
+CONFIG_CPU_CK810=y
+CSKY_BUILTIN_DTB=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y

+ 0 - 6
target/csky/systems/qemu-csky

@@ -1,6 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_CSKY
-	bool "Qemu Emulator"
-	select ADK_TARGET_QEMU
-	help
-	  Qemu Emulator for C-SKY architecture.
-

+ 7 - 0
target/csky/systems/qemu-csky-ck610

@@ -0,0 +1,7 @@
+config ADK_TARGET_SYSTEM_QEMU_CSKY_CK610
+	bool "Qemu Emulator (ck610)"
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_CSKY_CK610
+	help
+	  Qemu Emulator for C-SKY architecture (ck610).
+

+ 7 - 0
target/csky/systems/qemu-csky-ck807f

@@ -0,0 +1,7 @@
+config ADK_TARGET_SYSTEM_QEMU_CSKY_CK807F
+	bool "Qemu Emulator (ck807f)"
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_CSKY_CK807F
+	help
+	  Qemu Emulator for C-SKY architecture (ck807f).
+

+ 7 - 0
target/csky/systems/qemu-csky-ck810f

@@ -0,0 +1,7 @@
+config ADK_TARGET_SYSTEM_QEMU_CSKY_CK810F
+	bool "Qemu Emulator (ck810f)"
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_CSKY_CK810F
+	help
+	  Qemu Emulator for C-SKY architecture (ck810f).
+