diff options
| -rw-r--r-- | target/config/Config.in.cpu | 8 | ||||
| -rw-r--r-- | target/csky/Makefile | 8 | ||||
| -rw-r--r-- | target/csky/kernel/qemu-csky-ck610 (renamed from target/csky/kernel/qemu-csky) | 1 | ||||
| -rw-r--r-- | target/csky/kernel/qemu-csky-ck807f | 3 | ||||
| -rw-r--r-- | target/csky/kernel/qemu-csky-ck810f | 4 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky | 6 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky-ck610 | 7 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky-ck807f | 7 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky-ck810f | 7 |
9 files changed, 40 insertions, 11 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index fd745bcab..5f453bc90 100644 --- a/target/config/Config.in.cpu +++ b/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 diff --git a/target/csky/Makefile b/target/csky/Makefile index 4c550b407..4765ed007 100644 --- a/target/csky/Makefile +++ b/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) diff --git a/target/csky/kernel/qemu-csky b/target/csky/kernel/qemu-csky-ck610 index b85f755ac..3725f01d2 100644 --- a/target/csky/kernel/qemu-csky +++ b/target/csky/kernel/qemu-csky-ck610 @@ -1,2 +1,3 @@ CONFIG_CSKY=y +CONFIG_CPU_CK610=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/csky/kernel/qemu-csky-ck807f b/target/csky/kernel/qemu-csky-ck807f new file mode 100644 index 000000000..1dc23212a --- /dev/null +++ b/target/csky/kernel/qemu-csky-ck807f @@ -0,0 +1,3 @@ +CONFIG_CSKY=y +CONFIG_CPU_CK807=y +CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/csky/kernel/qemu-csky-ck810f b/target/csky/kernel/qemu-csky-ck810f new file mode 100644 index 000000000..58a17168d --- /dev/null +++ b/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 diff --git a/target/csky/systems/qemu-csky b/target/csky/systems/qemu-csky deleted file mode 100644 index 2ee092c6d..000000000 --- a/target/csky/systems/qemu-csky +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_CSKY - bool "Qemu Emulator" - select ADK_TARGET_QEMU - help - Qemu Emulator for C-SKY architecture. - diff --git a/target/csky/systems/qemu-csky-ck610 b/target/csky/systems/qemu-csky-ck610 new file mode 100644 index 000000000..6a4b7c552 --- /dev/null +++ b/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). + diff --git a/target/csky/systems/qemu-csky-ck807f b/target/csky/systems/qemu-csky-ck807f new file mode 100644 index 000000000..f1deaef84 --- /dev/null +++ b/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). + diff --git a/target/csky/systems/qemu-csky-ck810f b/target/csky/systems/qemu-csky-ck810f new file mode 100644 index 000000000..d5bc10643 --- /dev/null +++ b/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). + |