diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2019-10-29 15:26:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2019-10-29 15:42:40 +0100 |
| commit | 4c6c03c3152d6b9f8c08746e797781566b2fc2cb (patch) | |
| tree | f91d1abdb520f52087b3b4775b5fb9f4448117d9 /target/csky | |
| parent | e8a52fd6a3dd4693849a99edd217c38bacb5401d (diff) | |
csky: rework qemu support
Diffstat (limited to 'target/csky')
| -rw-r--r-- | target/csky/Makefile | 8 | ||||
| -rw-r--r-- | target/csky/kernel/qemu-csky (renamed from target/csky/kernel/qemu-csky-ck610) | 1 | ||||
| -rw-r--r-- | target/csky/kernel/qemu-csky-ck807 | 8 | ||||
| -rw-r--r-- | target/csky/kernel/qemu-csky-ck810 | 8 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky | 7 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky-ck807 | 8 | ||||
| -rw-r--r-- | target/csky/systems/qemu-csky-ck810 | 8 |
7 files changed, 10 insertions, 38 deletions
diff --git a/target/csky/Makefile b/target/csky/Makefile index 83f4363f7..a79b2c4d7 100644 --- a/target/csky/Makefile +++ b/target/csky/Makefile @@ -7,12 +7,10 @@ include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) -QEMU_ARGS:=${ADK_QEMU_ARGS} -M virt -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK807),y) -QEMU:=qemu-system-cskyv2 -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK810),y) QEMU:=qemu-system-cskyv2 +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) +QEMU_ARGS:=${ADK_QEMU_ARGS} -M virt +QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 endif # target helper text diff --git a/target/csky/kernel/qemu-csky-ck610 b/target/csky/kernel/qemu-csky index 0b5df804f..1d06909b6 100644 --- a/target/csky/kernel/qemu-csky-ck610 +++ b/target/csky/kernel/qemu-csky @@ -1,5 +1,4 @@ CONFIG_CSKY=y -CONFIG_CPU_CK610=y CONFIG_CSKY_IRQ=y CONFIG_RAM_BASE=0x0 CONFIG_NATIONALCHIP_IRQ=y diff --git a/target/csky/kernel/qemu-csky-ck807 b/target/csky/kernel/qemu-csky-ck807 deleted file mode 100644 index ea91eeffe..000000000 --- a/target/csky/kernel/qemu-csky-ck807 +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_CSKY=y -CONFIG_CPU_CK807=y -CONFIG_CSKY_IRQ=y -CONFIG_RAM_BASE=0x0 -CONFIG_NATIONALCHIP_IRQ=y -CONFIG_NATIONALCHIP_TIMER=y -CONFIG_CSKYMAC=y -CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/csky/kernel/qemu-csky-ck810 b/target/csky/kernel/qemu-csky-ck810 deleted file mode 100644 index 6abd83aa8..000000000 --- a/target/csky/kernel/qemu-csky-ck810 +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_CSKY=y -CONFIG_CPU_CK810=y -CONFIG_CSKY_IRQ=y -CONFIG_RAM_BASE=0x0 -CONFIG_NATIONALCHIP_IRQ=y -CONFIG_NATIONALCHIP_TIMER=y -CONFIG_CSKYMAC=y -CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/csky/systems/qemu-csky b/target/csky/systems/qemu-csky new file mode 100644 index 000000000..ee38d08c5 --- /dev/null +++ b/target/csky/systems/qemu-csky @@ -0,0 +1,7 @@ +config ADK_TARGET_SYSTEM_QEMU_CSKY + bool "Qemu Emulator" + select ADK_TARGET_QEMU + select ADK_TARGET_KERNEL_WITH_COMPRESSION + help + Qemu Emulator for C-SKY architecture. + diff --git a/target/csky/systems/qemu-csky-ck807 b/target/csky/systems/qemu-csky-ck807 deleted file mode 100644 index c938c70cd..000000000 --- a/target/csky/systems/qemu-csky-ck807 +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 - bool "Qemu Emulator (ck807)" - select ADK_TARGET_QEMU - select ADK_TARGET_CPU_CSKY_CK807 - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for C-SKY architecture (ck807). - diff --git a/target/csky/systems/qemu-csky-ck810 b/target/csky/systems/qemu-csky-ck810 deleted file mode 100644 index 68a431588..000000000 --- a/target/csky/systems/qemu-csky-ck810 +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 - bool "Qemu Emulator (ck810)" - select ADK_TARGET_QEMU - select ADK_TARGET_CPU_CSKY_CK810 - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for C-SKY architecture (ck810). - |