Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion boot-qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function parse_parameters() {
-a | --arch | --architecture)
shift
case ${1} in
arm32_v5 | arm32_v6 | arm32_v7 | arm64 | mips | mipsel | ppc32 | ppc64 | ppc64le | riscv | x86 | x86_64) ARCH=${1} ;;
arm32_v5 | arm32_v6 | arm32_v7 | arm64 | mips | mipsel | ppc32 | ppc64 | ppc64le | riscv | s390 | x86 | x86_64) ARCH=${1} ;;
*) die "Invalid --arch value '${1}'" ;;
esac
;;
Expand Down Expand Up @@ -203,6 +203,12 @@ function setup_qemu_args() {
QEMU=(qemu-system-riscv64)
;;

s390)
KIMAGE=bzImage
QEMU_ARCH_ARGS=(-M s390-ccw-virtio)
QEMU=(qemu-system-s390x)
;;

x86 | x86_64)
KIMAGE=bzImage
APPEND_STRING+="console=ttyS0 "
Expand Down
2 changes: 1 addition & 1 deletion buildroot/rebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CONFIGS=()
while ((${#})); do
case ${1} in
all) for CONFIG in *.config; do CONFIGS+=("../${CONFIG}"); done ;;
arm64 | arm | mips | mipsel | ppc32 | ppc64 | ppc64le | riscv | x86 | x86_64) CONFIGS+=("../${1}.config") ;;
arm64 | arm | mips | mipsel | ppc32 | ppc64 | ppc64le | riscv | s390 | x86 | x86_64) CONFIGS+=("../${1}.config") ;;
*) die "Unknown parameter '${1}', exiting!" ;;
esac
shift
Expand Down
11 changes: 11 additions & 0 deletions buildroot/s390.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
BR2_s390x=y
BR2_OPTIMIZE_3=y
BR2_KERNEL_HEADERS_4_4=y
BR2_GCC_VERSION_8_X=y
BR2_TARGET_GENERIC_ROOT_PASSWD="root"
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this port correct? I copied this from a different arch's config, so I suppose it's likely incorrect.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest using configs/qemu_s390x_defconfig as a template or are there reasons for not doing it ?

BR2_ROOTFS_OVERLAY="../overlay-poweroff"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_BASH=y
BR2_TARGET_ROOTFS_CPIO=y
# BR2_TARGET_ROOTFS_TAR is not set
Binary file added images/s390/rootfs.cpio.zst
Binary file not shown.