From cdf43bfc47a4153638db66f9d843636a27c5fc14 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 28 Jul 2023 08:43:01 +0200
Subject: s390x: fix 6.1.x bootup
---
mk/image.mk | 1 +
target/s390/Makefile | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mk/image.mk b/mk/image.mk
index 19e06b6b9..c7e1a396a 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -167,6 +167,7 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
echo "nod /dev/ram 0655 0 0 b 1 1"; \
echo "nod /dev/ttyS0 0660 0 0 c 4 64"; \
echo "nod /dev/ttyS1 0660 0 0 c 4 65"; \
+ echo "nod /dev/ttysclp0 0660 0 0 c 4 65"; \
echo "nod /dev/ttyB0 0660 0 0 c 11 0"; \
echo "nod /dev/ttyB1 0660 0 0 c 11 1"; \
echo "nod /dev/ttyAMA0 0660 0 0 c 204 64"; \
diff --git a/target/s390/Makefile b/target/s390/Makefile
index d037b14f8..4e4dd8496 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)/arch/s390/boot/compressed/vmlinux
+KERNEL:=$(LINUX_DIR)/arch/s390/boot/bzImage
-QEMU_ARGS:=-monitor null -M s390-ccw-virtio-2.4
+QEMU_ARGS:=-monitor null -M s390-ccw-virtio
QEMU_ARGS+=${ADK_QEMU_ARGS}
-QEMU_ARGS+=-net nic,model=virtio -net user
+QEMU_ARGS+=-net nic,model=virtio -net user -serial mon:stdio
# target helper text
ifeq ($(ADK_TARGET_FS),archive)
--
cgit v1.2.3