summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/s390/Makefile4
-rw-r--r--target/s390/systems/qemu-s3901
2 files changed, 3 insertions, 2 deletions
diff --git a/target/s390/Makefile b/target/s390/Makefile
index 93373aaa8..d037b14f8 100644
--- a/target/s390/Makefile
+++ b/target/s390/Makefile
@@ -5,11 +5,11 @@ include $(ADK_TOPDIR)/rules.mk
include $(ADK_TOPDIR)/mk/kernel-build.mk
include $(ADK_TOPDIR)/mk/image.mk
-KERNEL:=$(LINUX_DIR)/vmlinux
+KERNEL:=$(LINUX_DIR)/arch/s390/boot/compressed/vmlinux
QEMU_ARGS:=-monitor null -M s390-ccw-virtio-2.4
QEMU_ARGS+=${ADK_QEMU_ARGS}
-QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-ccw,netdev=eth0
+QEMU_ARGS+=-net nic,model=virtio -net user
# target helper text
ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/s390/systems/qemu-s390 b/target/s390/systems/qemu-s390
index 692f4a53c..dbb0a4c23 100644
--- a/target/s390/systems/qemu-s390
+++ b/target/s390/systems/qemu-s390
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_S390
bool "Qemu Emulator"
select ADK_TARGET_CPU_S390_Z900
select ADK_TARGET_QEMU
+ select ADK_TARGET_KERNEL_BZIMAGE
select ADK_TARGET_KERNEL_WITH_COMPRESSION
help
Support for Qemu Emulator S/390 architecture.