Browse Source

s390x: fix 6.1.x bootup

Waldemar Brodkorb 9 months ago
parent
commit
cdf43bfc47
2 changed files with 4 additions and 3 deletions
  1. 1 0
      mk/image.mk
  2. 3 3
      target/s390/Makefile

+ 1 - 0
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"; \

+ 3 - 3
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)