gitlab Qemu runtime testing
Subsystems (4)
v3 cover gitlab Qemu runtime testing
This new iteration take into account the previous review with some additional rework.
This series start by removing useless host-qemu build for m68k_q800, enable serial console for x86/x86_64 and some refactoring for csky and arm-versatile.
Replace the readme.txt file by a bash script that ease starting Qemu. Then a new comment is added to each Qemu defconfig files in order to provide the path to this new script.
This path help to link each Qemu defconfig with it's own script.
Add new python script to be used by gitlab to start Qemu when a Qemu defconfig is built.
Finally add this new python script to .gitlab-ci.yml.
http://lists.busybox.net/pipermail/buildroot/2019-May/249432.html
Jugurtha BELKALEM (3):
board/qemu/*/launch.sh: add qemu launch script support/scripts/boot-qemu-image.py: boot Qemu images with Qemu-system. gitlab.yml.in*: enable Qemu gitlab testing
Romain Naour (8):
configs/qemu_m68k_q800: remove host-qemu configs/qemu{x86,x86_64}: add a serial console board/qemu/arm-versatile: move arm-versatile nommu stuff to
board/qemu/arm-versatile-nommu
board/qemu/csky: move csky610 stuff to board/qemu/csky610-virt board/qemu/csky: move csky807 stuff to board/qemu/csky807-virt board/qemu/csky: move csky810 stuff to board/qemu/csky810-virt board/qemu/csky: move csky860 stuff to board/qemu/csky860-virt configs/qemu-*: add a comment to provide the path launch.sh script for
each Qemu defconfig
.gitlab-ci.yml | 7 ++
.gitlab-ci.yml.in | 7 ++
board/qemu/aarch64-virt/launch.sh | 7 ++
board/qemu/aarch64-virt/readme.txt | 7 --
board/qemu/arm-versatile-nommu/launch.sh | 8 ++
.../linux.config} | 0
.../patches/linux/versatile-nommu.patch | 0
board/qemu/arm-versatile/launch.sh | 8 ++
board/qemu/arm-versatile/readme.txt | 12 --
board/qemu/arm-vexpress-tz/launch.sh | 3 +
board/qemu/arm-vexpress/launch.sh | 11 ++
board/qemu/arm-vexpress/readme.txt | 11 --
board/qemu/csky/readme.txt | 12 --
board/qemu/csky610-virt/launch.sh | 5 +
.../linux.config.fragment} | 0
board/qemu/csky807-virt/launch.sh | 5 +
.../linux.config.fragment} | 0
board/qemu/csky810-virt/launch.sh | 5 +
.../linux.config.fragment} | 0
board/qemu/csky860-virt/launch.sh | 5 +
.../linux.config.fragment} | 0
board/qemu/m68k-mcf5208/launch.sh | 7 ++
board/qemu/m68k-mcf5208/readme.txt | 7 --
board/qemu/m68k-q800/launch.sh | 8 ++
board/qemu/m68k-q800/readme.txt | 8 --
board/qemu/microblazebe-mmu/launch.sh | 7 ++
board/qemu/microblazebe-mmu/readme.txt | 7 --
board/qemu/microblazeel-mmu/launch.sh | 7 ++
board/qemu/microblazeel-mmu/readme.txt | 7 --
board/qemu/mips32r2-malta/launch.sh | 2 +
board/qemu/mips32r2-malta/readme.txt | 9 --
board/qemu/mips32r2el-malta/launch.sh | 9 ++
board/qemu/mips32r2el-malta/readme.txt | 9 --
board/qemu/mips32r6-malta/launch.sh | 7 ++
board/qemu/mips32r6-malta/readme.txt | 7 --
board/qemu/mips32r6el-malta/launch.sh | 7 ++
board/qemu/mips32r6el-malta/readme.txt | 7 --
board/qemu/mips64-malta/launch.sh | 8 ++
board/qemu/mips64-malta/readme.txt | 8 --
board/qemu/mips64el-malta/launch.sh | 8 ++
board/qemu/mips64el-malta/readme.txt | 8 --
board/qemu/mips64r6-malta/launch.sh | 7 ++
board/qemu/mips64r6-malta/readme.txt | 7 --
board/qemu/mips64r6el-malta/launch.sh | 7 ++
board/qemu/mips64r6el-malta/readme.txt | 7 --
board/qemu/nios2-10m50/launch.sh | 7 ++
board/qemu/nios2-10m50/readme.txt | 7 --
board/qemu/or1k/launch.sh | 9 ++
board/qemu/or1k/readme.txt | 9 --
board/qemu/ppc-g3beige/launch.sh | 8 ++
board/qemu/ppc-g3beige/readme.txt | 8 --
board/qemu/ppc-mac99/launch.sh | 5 +
board/qemu/ppc-mac99/readme.txt | 5 -
board/qemu/ppc-mpc8544ds/launch.sh | 7 ++
board/qemu/ppc-mpc8544ds/readme.txt | 7 --
board/qemu/ppc-virtex-ml507/launch.sh | 7 ++
board/qemu/ppc-virtex-ml507/readme.txt | 7 --
board/qemu/ppc64-e5500/launch.sh | 7 ++
board/qemu/ppc64-e5500/readme.txt | 7 --
board/qemu/ppc64-pseries/launch.sh | 7 ++
board/qemu/ppc64-pseries/readme.txt | 7 --
board/qemu/ppc64le-pseries/launch.sh | 7 ++
board/qemu/ppc64le-pseries/readme.txt | 7 --
board/qemu/riscv32-virt/launch.sh | 7 ++
board/qemu/riscv32-virt/readme.txt | 7 --
board/qemu/riscv64-virt/launch.sh | 8 ++
board/qemu/riscv64-virt/readme.txt | 7 --
board/qemu/sh4-r2d/launch.sh | 9 ++
board/qemu/sh4-r2d/readme.txt | 8 --
board/qemu/sh4eb-r2d/launch.sh | 8 ++
board/qemu/sh4eb-r2d/readme.txt | 8 --
board/qemu/sparc-ss10/launch.sh | 7 ++
board/qemu/sparc-ss10/readme.txt | 7 --
board/qemu/sparc64-sun4u/launch.sh | 7 ++
board/qemu/sparc64-sun4u/readme.txt | 7 --
board/qemu/x86/launch.sh | 9 ++
board/qemu/x86/post-build.sh | 11 ++
board/qemu/x86/readme.txt | 9 --
board/qemu/x86_64/launch.sh | 9 ++
board/qemu/x86_64/post-build.sh | 11 ++
board/qemu/x86_64/readme.txt | 9 --
board/qemu/xtensa-lx60/launch.sh | 7 ++
board/qemu/xtensa-lx60/readme.txt | 7 --
configs/qemu_aarch64_virt_defconfig | 2 +
configs/qemu_arm_versatile_defconfig | 2 +
configs/qemu_arm_versatile_nommu_defconfig | 6 +-
configs/qemu_arm_vexpress_defconfig | 2 +
configs/qemu_arm_vexpress_tz_defconfig | 2 +
configs/qemu_csky610_virt_defconfig | 4 +-
configs/qemu_csky807_virt_defconfig | 4 +-
configs/qemu_csky810_virt_defconfig | 4 +-
configs/qemu_csky860_virt_defconfig | 4 +-
configs/qemu_m68k_mcf5208_defconfig | 2 +
configs/qemu_m68k_q800_defconfig | 6 +-
configs/qemu_microblazebe_mmu_defconfig | 2 +
configs/qemu_microblazeel_mmu_defconfig | 2 +
configs/qemu_mips32r2_malta_defconfig | 2 +
configs/qemu_mips32r2el_malta_defconfig | 2 +
configs/qemu_mips32r6_malta_defconfig | 2 +
configs/qemu_mips32r6el_malta_defconfig | 2 +
configs/qemu_mips64_malta_defconfig | 2 +
configs/qemu_mips64el_malta_defconfig | 2 +
configs/qemu_mips64r6_malta_defconfig | 2 +
configs/qemu_mips64r6el_malta_defconfig | 2 +
configs/qemu_nios2_10m50_defconfig | 2 +
configs/qemu_or1k_defconfig | 2 +
configs/qemu_ppc64_e5500_defconfig | 2 +
configs/qemu_ppc64_pseries_defconfig | 2 +
configs/qemu_ppc64le_pseries_defconfig | 2 +
configs/qemu_ppc_g3beige_defconfig | 2 +
configs/qemu_ppc_mac99_defconfig | 2 +
configs/qemu_ppc_mpc8544ds_defconfig | 2 +
configs/qemu_ppc_virtex_ml507_defconfig | 2 +
configs/qemu_riscv32_virt_defconfig | 2 +
configs/qemu_riscv64_virt_defconfig | 2 +
configs/qemu_sh4_r2d_defconfig | 2 +
configs/qemu_sh4eb_r2d_defconfig | 2 +
configs/qemu_sparc64_sun4u_defconfig | 2 +
configs/qemu_sparc_ss10_defconfig | 2 +
configs/qemu_x86_64_defconfig | 6 +-
configs/qemu_x86_defconfig | 6 +-
configs/qemu_xtensa_lx60_defconfig | 2 +
configs/qemu_xtensa_lx60_nommu_defconfig | 2 +
support/scripts/boot-qemu-image.py | 109 ++++++++++++++++++
124 files changed, 511 insertions(+), 280 deletions(-)
create mode 100755 board/qemu/aarch64-virt/launch.sh
delete mode 100644 board/qemu/aarch64-virt/readme.txt
create mode 100644 board/qemu/arm-versatile-nommu/launch.sh
rename board/qemu/{arm-versatile/linux-nommu.config => arm-versatile-nommu/linux.config} (100%)
rename board/qemu/{arm-versatile => arm-versatile-nommu}/patches/linux/versatile-nommu.patch (100%)
create mode 100755 board/qemu/arm-versatile/launch.sh
delete mode 100644 board/qemu/arm-versatile/readme.txt
create mode 100644 board/qemu/arm-vexpress-tz/launch.sh
create mode 100755 board/qemu/arm-vexpress/launch.sh
delete mode 100644 board/qemu/arm-vexpress/readme.txt
delete mode 100644 board/qemu/csky/readme.txt
create mode 100644 board/qemu/csky610-virt/launch.sh
rename board/qemu/{csky/linux-ck610.config.fragment => csky610-virt/linux.config.fragment} (100%)
create mode 100644 board/qemu/csky807-virt/launch.sh
rename board/qemu/{csky/linux-ck807.config.fragment => csky807-virt/linux.config.fragment} (100%)
create mode 100644 board/qemu/csky810-virt/launch.sh
rename board/qemu/{csky/linux-ck810.config.fragment => csky810-virt/linux.config.fragment} (100%)
create mode 100644 board/qemu/csky860-virt/launch.sh
rename board/qemu/{csky/linux-ck860.config.fragment => csky860-virt/linux.config.fragment} (100%)
create mode 100755 board/qemu/m68k-mcf5208/launch.sh
delete mode 100644 board/qemu/m68k-mcf5208/readme.txt
create mode 100755 board/qemu/m68k-q800/launch.sh
delete mode 100644 board/qemu/m68k-q800/readme.txt
create mode 100755 board/qemu/microblazebe-mmu/launch.sh
delete mode 100644 board/qemu/microblazebe-mmu/readme.txt
create mode 100755 board/qemu/microblazeel-mmu/launch.sh
delete mode 100644 board/qemu/microblazeel-mmu/readme.txt
create mode 100755 board/qemu/mips32r2-malta/launch.sh
delete mode 100644 board/qemu/mips32r2-malta/readme.txt
create mode 100755 board/qemu/mips32r2el-malta/launch.sh
delete mode 100644 board/qemu/mips32r2el-malta/readme.txt
create mode 100755 board/qemu/mips32r6-malta/launch.sh
delete mode 100644 board/qemu/mips32r6-malta/readme.txt
create mode 100755 board/qemu/mips32r6el-malta/launch.sh
delete mode 100644 board/qemu/mips32r6el-malta/readme.txt
create mode 100755 board/qemu/mips64-malta/launch.sh
delete mode 100644 board/qemu/mips64-malta/readme.txt
create mode 100755 board/qemu/mips64el-malta/launch.sh
delete mode 100644 board/qemu/mips64el-malta/readme.txt
create mode 100755 board/qemu/mips64r6-malta/launch.sh
delete mode 100644 board/qemu/mips64r6-malta/readme.txt
create mode 100755 board/qemu/mips64r6el-malta/launch.sh
delete mode 100644 board/qemu/mips64r6el-malta/readme.txt
create mode 100755 board/qemu/nios2-10m50/launch.sh
delete mode 100644 board/qemu/nios2-10m50/readme.txt
create mode 100755 board/qemu/or1k/launch.sh
delete mode 100644 board/qemu/or1k/readme.txt
create mode 100755 board/qemu/ppc-g3beige/launch.sh
delete mode 100644 board/qemu/ppc-g3beige/readme.txt
create mode 100644 board/qemu/ppc-mac99/launch.sh
delete mode 100644 board/qemu/ppc-mac99/readme.txt
create mode 100755 board/qemu/ppc-mpc8544ds/launch.sh
delete mode 100644 board/qemu/ppc-mpc8544ds/readme.txt
create mode 100755 board/qemu/ppc-virtex-ml507/launch.sh
delete mode 100644 board/qemu/ppc-virtex-ml507/readme.txt
create mode 100755 board/qemu/ppc64-e5500/launch.sh
delete mode 100644 board/qemu/ppc64-e5500/readme.txt
create mode 100755 board/qemu/ppc64-pseries/launch.sh
delete mode 100644 board/qemu/ppc64-pseries/readme.txt
create mode 100755 board/qemu/ppc64le-pseries/launch.sh
delete mode 100644 board/qemu/ppc64le-pseries/readme.txt
create mode 100755 board/qemu/riscv32-virt/launch.sh
delete mode 100644 board/qemu/riscv32-virt/readme.txt
create mode 100755 board/qemu/riscv64-virt/launch.sh
delete mode 100644 board/qemu/riscv64-virt/readme.txt
create mode 100755 board/qemu/sh4-r2d/launch.sh
delete mode 100644 board/qemu/sh4-r2d/readme.txt
create mode 100755 board/qemu/sh4eb-r2d/launch.sh
delete mode 100644 board/qemu/sh4eb-r2d/readme.txt
create mode 100755 board/qemu/sparc-ss10/launch.sh
delete mode 100644 board/qemu/sparc-ss10/readme.txt
create mode 100755 board/qemu/sparc64-sun4u/launch.sh
delete mode 100644 board/qemu/sparc64-sun4u/readme.txt
create mode 100755 board/qemu/x86/launch.sh
create mode 100755 board/qemu/x86/post-build.sh
delete mode 100644 board/qemu/x86/readme.txt
create mode 100755 board/qemu/x86_64/launch.sh
create mode 100755 board/qemu/x86_64/post-build.sh
delete mode 100644 board/qemu/x86_64/readme.txt
create mode 100755 board/qemu/xtensa-lx60/launch.sh
delete mode 100644 board/qemu/xtensa-lx60/readme.txt
create mode 100755 support/scripts/boot-qemu-image.pySignature · 1 line
2.21.0
PATCH v3 1/11 configs/qemu_m68k_q800: remove host-qemu
Building upstream host-qemu for m68k_q800 is useless since it doesn't support the q800 machine:
qemu-system-m68k: -M q800: unsupported machine type
This defconfig mush be used with the QEMU fork from [1] using q800-v2.11.0 branch.
[1] https://github.com/vivier/qemu-m68k
--- configs/qemu_m68k_q800_defconfig | 4 ---- 1 file changed, 4 deletions(-)
configs/qemu_m68k_q800_defconfig +0 -4
@@ -23,7 +23,3 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
Signature · 1 line
2.21.0
PATCH v3 2/11 configs/qemu{x86, x86_64}: add a serial console
In reply to Romain NaourThe current Buildroot defconfigs for qemu_x86 and qemu_x86_64 instantiate a console on tty1, which appears on QEMU's graphical window. Add a console on the serial port (ttyS0) to be used later for gitlab testing.
This change is need since the script used for gitlab testing needs to use a serial output with pexpect.
This change is similar to the one made for raspberrypi [1] to handle HDMI and serial console:
This requires three changes:
1. have two 'console=' entries in the kernel command line: tty1,
then ttyS0;
2. change BR2_TARGET_GENERIC_GETTY_PORT to "console", so it starts
a getty on the last console= passed to the kernel, ttyS0;3. add a new getty on tty1 to the generated inittab.
Step 2 is actually obtained by removing BR2_TARGET_GENERIC_GETTY_PORT entirely from the defconfigs, since "console" is the default value.
Step 3 requires a post-build script since the Buildroot makefiles can configure only one console.
Note: instead of simply adding a new getty on ttyS0 (which would work) this patch actually changes BR2_TARGET_GENERIC_GETTY_PORT to instantiate a console on UART, then adds back tty1 via post-build.sh. This is done only to avoid the "GENERIC_SERIAL" comment where we instantiate a console on QEMU graphical window, then instantiate a really-serial console on another line.
The result is these two inittab lines:
console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window
[1] 20878a1017e2bf7eb8c5f870dc6d2641493cb0f9
--- board/qemu/x86/post-build.sh | 11 +++++++++++ board/qemu/x86/readme.txt | 2 +- board/qemu/x86_64/post-build.sh | 11 +++++++++++ board/qemu/x86_64/readme.txt | 2 +- configs/qemu_x86_64_defconfig | 4 ++-- configs/qemu_x86_defconfig | 4 ++-- 6 files changed, 28 insertions(+), 6 deletions(-) create mode 100755 board/qemu/x86/post-build.sh create mode 100755 board/qemu/x86_64/post-build.sh
board/qemu/x86/post-build.sh new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +fi
board/qemu/x86/readme.txt +1 -1
@@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user Optionally add -smp N to emulate a SMP system with N CPUs.
board/qemu/x86_64/post-build.sh new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +fi
board/qemu/x86_64/readme.txt +1 -1
@@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user Optionally add -smp N to emulate a SMP system with N CPUs.
configs/qemu_x86_64_defconfig +2 -2
@@ -3,11 +3,11 @@ BR2_x86_64=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="tty1" -# Filesystem +# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
configs/qemu_x86_defconfig +2 -2
@@ -4,11 +4,11 @@ BR2_x86_pentiumpro=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="tty1" -# Filesystem +# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
Signature · 1 line
2.21.0
PATCH v3 2/11 configs/qemu{x86, x86_64}: add a serial console
Quoted 11 lines · Romain Naour
The current Buildroot defconfigs for
qemu_x86andqemu_x86_64instantiate a console on tty1, which appears on QEMU's graphical window. Add a console on the serial port (ttyS0) to be used later for gitlab testing.This change is need since the script used for gitlab testing needs to use a serial output with pexpect.
This change is similar to the one made for raspberrypi [1] to handle HDMI and serial console:
I think the serial console should be the default on all qemu defconfigs, since it best matches embedded devices.
In the long run it should be possible to configure additional ttys by means of a cleaner and standard mechanism. I even sketched it by meas of a BR2_TARGET_GETTY_PORTS list some time but lost it when moved to a new job. I will try to recreate it and submit a draft for review.
Signature · 1 line
Carlos Santos <[email protected]>
PATCH v3 2/11 configs/qemu{x86, x86_64}: add a serial console
Hi Carlos,
Thanks for your feedback!
Le 22/11/2019 ? 12:27, Carlos Santos a ?crit?:
Quoted 7 lines · Romain Naour
Quoted 6 lines
The current Buildroot defconfigs for
qemu_x86andqemu_x86_64instantiate a console on tty1, which appears on QEMU's graphical window. Add a console on the serial port (ttyS0) to be used later for gitlab testing.
Quoted 8 lines
Quoted 5 lines
This change is need since the script used for gitlab testing needs to use a serial output with pexpect.
This change is similar to the one made for raspberrypi [1] to handle HDMI and serial console:
I think the serial console should be the default on all qemu defconfigs, since it best matches embedded devices.
At least it's the common starting point when you start working with Buildroot and a new embedded device.
Only x86 qemu defconfig was not using the serial console by default.
Quoted 6 lines
In the long run it should be possible to configure additional ttys by means of a cleaner and standard mechanism. I even sketched it by meas of a
BR2_TARGET_GETTY_PORTSlist some time but lost it when moved to a new job. I will try to recreate it and submit a draft for review.
Ok.
Best regards,
Romain
PATCH v3 3/11 board/qemu/arm-versatile: move arm-versatile nommu stuff to board/qemu/arm-versatile-nommu
In reply to Romain NaourIn order to indroduce automated gitlab testing for all qemu defconfig, split arm-versatile (MMU) and arm-versatile (noMMU) to a separate directory.
---
.../linux-nommu.config => arm-versatile-nommu/linux.config} | 0
.../patches/linux/versatile-nommu.patch | 0
board/qemu/{arm-versatile => arm-versatile-nommu}/readme.txt | 4 ----
board/qemu/arm-versatile/readme.txt | 4 ----
configs/qemu_arm_versatile_nommu_defconfig | 4 ++--
5 files changed, 2 insertions(+), 10 deletions(-)
rename board/qemu/{arm-versatile/linux-nommu.config => arm-versatile-nommu/linux.config} (100%)
rename board/qemu/{arm-versatile => arm-versatile-nommu}/patches/linux/versatile-nommu.patch (100%)
copy board/qemu/{arm-versatile => arm-versatile-nommu}/readme.txt (53%)board/qemu/arm-versatile-nommu/linux.config renamed from board/qemu/arm-versatile/linux-nommu.config +0 -0
board/qemu/arm-versatile-nommu/patches/linux/versatile-nommu.patch renamed from board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +0 -0
board/qemu/arm-versatile-nommu/readme.txt renamed from board/qemu/arm-versatile/readme.txt +0 -4
@@ -1,9 +1,5 @@ Run the emulation with: - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user - -Or for the noMMU emulation: - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 The login prompt will appear in the terminal that started Qemu. The
board/qemu/arm-versatile/readme.txt +0 -4
@@ -2,10 +2,6 @@ Run the emulation with: qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user -Or for the noMMU emulation: - - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 - The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer.
configs/qemu_arm_versatile_nommu_defconfig +2 -2
@@ -7,7 +7,7 @@ BR2_PACKAGE_HOST_ELF2FLT=y # BR2_USE_MMU is not set # Patches -BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile/patches" +BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile-nommu/patches" # Busybox with hush BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
@@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile-nommu/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb"
Signature · 1 line
2.21.0
PATCH v3 4/11 board/qemu/csky: move csky610 stuff to board/qemu/csky610-virt
In reply to Romain NaourIn order to indroduce automated gitlab testing for all qemu defconfig, split all csky boards to a separate directory.
---
board/qemu/csky/readme.txt | 3 ---
.../linux.config.fragment} | 0
board/qemu/csky610-virt/readme.txt | 5 +++++
configs/qemu_csky610_virt_defconfig | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
rename board/qemu/{csky/linux-ck610.config.fragment => csky610-virt/linux.config.fragment} (100%)
create mode 100644 board/qemu/csky610-virt/readme.txtboard/qemu/csky/readme.txt +0 -3
@@ -6,7 +6,4 @@ For ck860 smp: For ck810/ck807: qemu-system-cskyv2 -M virt -nographic -kernel vmlinux -For ck610: - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux - The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky610-virt/linux.config.fragment renamed from board/qemu/csky/linux-ck610.config.fragment +0 -0
board/qemu/csky610-virt/readme.txt new file +5 -0
@@ -0,0 +1,5 @@ +Run with qemu: + + qemu-system-cskyv1 -M virt -nographic -kernel vmlinux + +The login prompt will appear in the terminal that started Qemu. Username is root and no password.
configs/qemu_csky610_virt_defconfig +1 -1
@@ -13,4 +13,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky610-virt/linux.config.fragment"
Signature · 1 line
2.21.0
PATCH v3 5/11 board/qemu/csky: move csky807 stuff to board/qemu/csky807-virt
In reply to Romain NaourIn order to indroduce automated gitlab testing for all qemu defconfig, split all csky boards to a separate directory.
---
board/qemu/csky/readme.txt | 2 +-
.../linux.config.fragment} | 0
board/qemu/csky807-virt/readme.txt | 5 +++++
configs/qemu_csky807_virt_defconfig | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
rename board/qemu/{csky/linux-ck807.config.fragment => csky807-virt/linux.config.fragment} (100%)
create mode 100644 board/qemu/csky807-virt/readme.txtboard/qemu/csky/readme.txt +1 -1
@@ -3,7 +3,7 @@ Run with qemu: For ck860 smp: qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux -For ck810/ck807: +For ck810: qemu-system-cskyv2 -M virt -nographic -kernel vmlinux The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky807-virt/linux.config.fragment renamed from board/qemu/csky/linux-ck807.config.fragment +0 -0
board/qemu/csky807-virt/readme.txt new file +5 -0
@@ -0,0 +1,5 @@ +Run with qemu: + +qemu-system-cskyv2 -M virt -nographic -kernel vmlinux + +The login prompt will appear in the terminal that started Qemu. Username is root and no password.
configs/qemu_csky807_virt_defconfig +1 -1
@@ -13,4 +13,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky807-virt/linux.config.fragment"
Signature · 1 line
2.21.0
PATCH v3 6/11 board/qemu/csky: move csky810 stuff to board/qemu/csky810-virt
In reply to Romain NaourIn order to indroduce automated gitlab testing for all qemu defconfig, split all csky boards to a separate directory.
---
board/qemu/csky/readme.txt | 3 ---
.../linux.config.fragment} | 0
board/qemu/{csky => csky810-virt}/readme.txt | 4 ----
configs/qemu_csky810_virt_defconfig | 2 +-
4 files changed, 1 insertion(+), 8 deletions(-)
rename board/qemu/{csky/linux-ck810.config.fragment => csky810-virt/linux.config.fragment} (100%)
copy board/qemu/{csky => csky810-virt}/readme.txt (62%)board/qemu/csky/readme.txt +0 -3
@@ -3,7 +3,4 @@ Run with qemu: For ck860 smp: qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux -For ck810: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux - The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky810-virt/linux.config.fragment renamed from board/qemu/csky/linux-ck810.config.fragment +0 -0
board/qemu/csky810-virt/readme.txt renamed from board/qemu/csky/readme.txt +0 -4
@@ -1,9 +1,5 @@ Run with qemu: -For ck860 smp: - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux - -For ck810: qemu-system-cskyv2 -M virt -nographic -kernel vmlinux The login prompt will appear in the terminal that started Qemu. Username is root and no password.
configs/qemu_csky810_virt_defconfig +1 -1
@@ -13,4 +13,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky810-virt/linux.config.fragment"
Signature · 1 line
2.21.0
PATCH v3 7/11 board/qemu/csky: move csky860 stuff to board/qemu/csky860-virt
In reply to Romain NaourIn order to indroduce automated gitlab testing for all qemu defconfig, split all csky boards to a separate directory.
---
.../linux.config.fragment} | 0
board/qemu/{csky => csky860-virt}/readme.txt | 1 -
configs/qemu_csky860_virt_defconfig | 2 +-
3 files changed, 1 insertion(+), 2 deletions(-)
rename board/qemu/{csky/linux-ck860.config.fragment => csky860-virt/linux.config.fragment} (100%)
rename board/qemu/{csky => csky860-virt}/readme.txt (92%)board/qemu/csky860-virt/linux.config.fragment renamed from board/qemu/csky/linux-ck860.config.fragment +0 -0
board/qemu/csky860-virt/readme.txt renamed from board/qemu/csky/readme.txt +0 -1
@@ -1,6 +1,5 @@ Run with qemu: -For ck860 smp: qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux The login prompt will appear in the terminal that started Qemu. Username is root and no password.
configs/qemu_csky860_virt_defconfig +1 -1
@@ -13,4 +13,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky860-virt/linux.config.fragment"
Signature · 1 line
2.21.0
PATCH v3 8/11 board/qemu/*/launch.sh: add qemu launch script
In reply to Romain NaourFrom: Jugurtha BELKALEM <[email protected]>
It is not very convenient for Buildroot users to store the Qemu command line in a readme.txt instead of a script to be used as soon as the Qemu image has been created.
This patch replace the readme.txt file located in board/qemu/<Qemu target>/ by a script (launch.sh).
This allow Buildroot user to start easily Qemu using only one simple command:
$ ./board/qemu/aarch64-virt/launch.sh test/qemu_aarch64_virt/
--- board/qemu/aarch64-virt/launch.sh | 7 +++++++ board/qemu/aarch64-virt/readme.txt | 7 ------- board/qemu/arm-versatile-nommu/launch.sh | 8 ++++++++ board/qemu/arm-versatile-nommu/readme.txt | 8 -------- board/qemu/arm-versatile/launch.sh | 8 ++++++++ board/qemu/arm-versatile/readme.txt | 8 -------- board/qemu/arm-vexpress-tz/launch.sh | 3 +++ board/qemu/arm-vexpress/launch.sh | 11 +++++++++++ board/qemu/arm-vexpress/readme.txt | 11 ----------- board/qemu/csky610-virt/launch.sh | 5 +++++ board/qemu/csky610-virt/readme.txt | 5 ----- board/qemu/csky807-virt/launch.sh | 5 +++++ board/qemu/csky807-virt/readme.txt | 5 ----- board/qemu/csky810-virt/launch.sh | 5 +++++ board/qemu/csky810-virt/readme.txt | 5 ----- board/qemu/csky860-virt/launch.sh | 5 +++++ board/qemu/csky860-virt/readme.txt | 5 ----- board/qemu/m68k-mcf5208/launch.sh | 7 +++++++ board/qemu/m68k-mcf5208/readme.txt | 7 ------- board/qemu/m68k-q800/launch.sh | 8 ++++++++ board/qemu/m68k-q800/readme.txt | 8 -------- board/qemu/microblazebe-mmu/launch.sh | 7 +++++++ board/qemu/microblazebe-mmu/readme.txt | 7 ------- board/qemu/microblazeel-mmu/launch.sh | 7 +++++++ board/qemu/microblazeel-mmu/readme.txt | 7 ------- board/qemu/mips32r2-malta/launch.sh | 2 ++ board/qemu/mips32r2-malta/readme.txt | 9 --------- board/qemu/mips32r2el-malta/launch.sh | 9 +++++++++ board/qemu/mips32r2el-malta/readme.txt | 9 --------- board/qemu/mips32r6-malta/launch.sh | 7 +++++++ board/qemu/mips32r6-malta/readme.txt | 7 ------- board/qemu/mips32r6el-malta/launch.sh | 7 +++++++ board/qemu/mips32r6el-malta/readme.txt | 7 ------- board/qemu/mips64-malta/launch.sh | 8 ++++++++ board/qemu/mips64-malta/readme.txt | 8 -------- board/qemu/mips64el-malta/launch.sh | 8 ++++++++ board/qemu/mips64el-malta/readme.txt | 8 -------- board/qemu/mips64r6-malta/launch.sh | 7 +++++++ board/qemu/mips64r6-malta/readme.txt | 7 ------- board/qemu/mips64r6el-malta/launch.sh | 7 +++++++ board/qemu/mips64r6el-malta/readme.txt | 7 ------- board/qemu/nios2-10m50/launch.sh | 7 +++++++ board/qemu/nios2-10m50/readme.txt | 7 ------- board/qemu/or1k/launch.sh | 9 +++++++++ board/qemu/or1k/readme.txt | 9 --------- board/qemu/ppc-g3beige/launch.sh | 8 ++++++++ board/qemu/ppc-g3beige/readme.txt | 8 -------- board/qemu/ppc-mac99/launch.sh | 5 +++++ board/qemu/ppc-mac99/readme.txt | 5 ----- board/qemu/ppc-mpc8544ds/launch.sh | 7 +++++++ board/qemu/ppc-mpc8544ds/readme.txt | 7 ------- board/qemu/ppc-virtex-ml507/launch.sh | 7 +++++++ board/qemu/ppc-virtex-ml507/readme.txt | 7 ------- board/qemu/ppc64-e5500/launch.sh | 7 +++++++ board/qemu/ppc64-e5500/readme.txt | 7 ------- board/qemu/ppc64-pseries/launch.sh | 7 +++++++ board/qemu/ppc64-pseries/readme.txt | 7 ------- board/qemu/ppc64le-pseries/launch.sh | 7 +++++++ board/qemu/ppc64le-pseries/readme.txt | 7 ------- board/qemu/riscv32-virt/launch.sh | 7 +++++++ board/qemu/riscv32-virt/readme.txt | 7 ------- board/qemu/riscv64-virt/launch.sh | 8 ++++++++ board/qemu/riscv64-virt/readme.txt | 7 ------- board/qemu/sh4-r2d/launch.sh | 9 +++++++++ board/qemu/sh4-r2d/readme.txt | 8 -------- board/qemu/sh4eb-r2d/launch.sh | 8 ++++++++ board/qemu/sh4eb-r2d/readme.txt | 8 -------- board/qemu/sparc-ss10/launch.sh | 7 +++++++ board/qemu/sparc-ss10/readme.txt | 7 ------- board/qemu/sparc64-sun4u/launch.sh | 7 +++++++ board/qemu/sparc64-sun4u/readme.txt | 7 ------- board/qemu/x86/launch.sh | 9 +++++++++ board/qemu/x86/readme.txt | 9 --------- board/qemu/x86_64/launch.sh | 9 +++++++++ board/qemu/x86_64/readme.txt | 9 --------- board/qemu/xtensa-lx60/launch.sh | 7 +++++++ board/qemu/xtensa-lx60/readme.txt | 7 ------- 77 files changed, 276 insertions(+), 278 deletions(-) create mode 100755 board/qemu/aarch64-virt/launch.sh delete mode 100644 board/qemu/aarch64-virt/readme.txt create mode 100755 board/qemu/arm-versatile-nommu/launch.sh delete mode 100644 board/qemu/arm-versatile-nommu/readme.txt create mode 100755 board/qemu/arm-versatile/launch.sh delete mode 100644 board/qemu/arm-versatile/readme.txt create mode 100755 board/qemu/arm-vexpress-tz/launch.sh create mode 100755 board/qemu/arm-vexpress/launch.sh delete mode 100644 board/qemu/arm-vexpress/readme.txt create mode 100755 board/qemu/csky610-virt/launch.sh delete mode 100644 board/qemu/csky610-virt/readme.txt create mode 100755 board/qemu/csky807-virt/launch.sh delete mode 100644 board/qemu/csky807-virt/readme.txt create mode 100755 board/qemu/csky810-virt/launch.sh delete mode 100644 board/qemu/csky810-virt/readme.txt create mode 100755 board/qemu/csky860-virt/launch.sh delete mode 100644 board/qemu/csky860-virt/readme.txt create mode 100755 board/qemu/m68k-mcf5208/launch.sh delete mode 100644 board/qemu/m68k-mcf5208/readme.txt create mode 100755 board/qemu/m68k-q800/launch.sh delete mode 100644 board/qemu/m68k-q800/readme.txt create mode 100755 board/qemu/microblazebe-mmu/launch.sh delete mode 100644 board/qemu/microblazebe-mmu/readme.txt create mode 100755 board/qemu/microblazeel-mmu/launch.sh delete mode 100644 board/qemu/microblazeel-mmu/readme.txt create mode 100755 board/qemu/mips32r2-malta/launch.sh delete mode 100644 board/qemu/mips32r2-malta/readme.txt create mode 100755 board/qemu/mips32r2el-malta/launch.sh delete mode 100644 board/qemu/mips32r2el-malta/readme.txt create mode 100755 board/qemu/mips32r6-malta/launch.sh delete mode 100644 board/qemu/mips32r6-malta/readme.txt create mode 100755 board/qemu/mips32r6el-malta/launch.sh delete mode 100644 board/qemu/mips32r6el-malta/readme.txt create mode 100755 board/qemu/mips64-malta/launch.sh delete mode 100644 board/qemu/mips64-malta/readme.txt create mode 100755 board/qemu/mips64el-malta/launch.sh delete mode 100644 board/qemu/mips64el-malta/readme.txt create mode 100755 board/qemu/mips64r6-malta/launch.sh delete mode 100644 board/qemu/mips64r6-malta/readme.txt create mode 100755 board/qemu/mips64r6el-malta/launch.sh delete mode 100644 board/qemu/mips64r6el-malta/readme.txt create mode 100755 board/qemu/nios2-10m50/launch.sh delete mode 100644 board/qemu/nios2-10m50/readme.txt create mode 100755 board/qemu/or1k/launch.sh delete mode 100644 board/qemu/or1k/readme.txt create mode 100755 board/qemu/ppc-g3beige/launch.sh delete mode 100644 board/qemu/ppc-g3beige/readme.txt create mode 100755 board/qemu/ppc-mac99/launch.sh delete mode 100644 board/qemu/ppc-mac99/readme.txt create mode 100755 board/qemu/ppc-mpc8544ds/launch.sh delete mode 100644 board/qemu/ppc-mpc8544ds/readme.txt create mode 100755 board/qemu/ppc-virtex-ml507/launch.sh delete mode 100644 board/qemu/ppc-virtex-ml507/readme.txt create mode 100755 board/qemu/ppc64-e5500/launch.sh delete mode 100644 board/qemu/ppc64-e5500/readme.txt create mode 100755 board/qemu/ppc64-pseries/launch.sh delete mode 100644 board/qemu/ppc64-pseries/readme.txt create mode 100755 board/qemu/ppc64le-pseries/launch.sh delete mode 100644 board/qemu/ppc64le-pseries/readme.txt create mode 100755 board/qemu/riscv32-virt/launch.sh delete mode 100644 board/qemu/riscv32-virt/readme.txt create mode 100755 board/qemu/riscv64-virt/launch.sh delete mode 100644 board/qemu/riscv64-virt/readme.txt create mode 100755 board/qemu/sh4-r2d/launch.sh delete mode 100644 board/qemu/sh4-r2d/readme.txt create mode 100755 board/qemu/sh4eb-r2d/launch.sh delete mode 100644 board/qemu/sh4eb-r2d/readme.txt create mode 100755 board/qemu/sparc-ss10/launch.sh delete mode 100644 board/qemu/sparc-ss10/readme.txt create mode 100755 board/qemu/sparc64-sun4u/launch.sh delete mode 100644 board/qemu/sparc64-sun4u/readme.txt create mode 100755 board/qemu/x86/launch.sh delete mode 100644 board/qemu/x86/readme.txt create mode 100755 board/qemu/x86_64/launch.sh delete mode 100644 board/qemu/x86_64/readme.txt create mode 100755 board/qemu/xtensa-lx60/launch.sh delete mode 100644 board/qemu/xtensa-lx60/readme.txt
board/qemu/aarch64-virt/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel ${1:-output}/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=${1:-output}/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/aarch64-virt/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/arm-versatile-nommu/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-arm -M versatilepb -kernel ${1:-output}/images/zImage -dtb ${1:-output}/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. + +# Tested with QEMU 2.12.0
board/qemu/arm-versatile-nommu/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/arm-versatile/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-arm -M versatilepb -kernel ${1:-output}/images/zImage -dtb ${1:-output}/images/versatile-pb.dtb -drive file=${1:-output}/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. + +# Tested with QEMU 2.12.0
board/qemu/arm-versatile/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/arm-vexpress-tz/launch.sh new file +3 -0
@@ -0,0 +1,3 @@ +#!/bin/env bash + +qemu-system-arm -machine virt -machine secure=on -cpu cortex-a15 -smp 1 -s -m 1024 -d unimp -serial stdio -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic -semihosting-config enable,target=native -bios ${1:-output}/images/bl1.bin
board/qemu/arm-vexpress/launch.sh new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/env bash + +qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel ${1:-output}/images/zImage -dtb ${1:-output}/images/vexpress-v2p-ca9.dtb -drive file=${1:-output}/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. + +# If you want to emulate more cores change "-smp 1" to "-smp 2" for +# dual-core or even "smp -4" for a quad-core configuration. + +# Tested with QEMU 2.12.0
board/qemu/arm-vexpress/readme.txt deleted +0 -11
@@ -1,11 +0,0 @@ -Run the emulation with: - - qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -If you want to emulate more cores change "-smp 1" to "-smp 2" for -dual-core or even "smp -4" for a quad-core configuration. - -Tested with QEMU 2.12.0
board/qemu/csky610-virt/launch.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/env bash + +qemu-system-cskyv1 -M virt -nographic -kernel vmlinux + +# The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky610-virt/readme.txt deleted +0 -5
@@ -1,5 +0,0 @@ -Run with qemu: - - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux - -The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky807-virt/launch.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/env bash + +qemu-system-cskyv2 -M virt -nographic -kernel vmlinux + +# The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky807-virt/readme.txt deleted +0 -5
@@ -1,5 +0,0 @@ -Run with qemu: - -qemu-system-cskyv2 -M virt -nographic -kernel vmlinux - -The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky810-virt/launch.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/env bash + +qemu-system-cskyv2 -M virt -nographic -kernel vmlinux + +# The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky810-virt/readme.txt deleted +0 -5
@@ -1,5 +0,0 @@ -Run with qemu: - - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux - -The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky860-virt/launch.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/env bash + +qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux + +# The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/csky860-virt/readme.txt deleted +0 -5
@@ -1,5 +0,0 @@ -Run with qemu: - - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux - -The login prompt will appear in the terminal that started Qemu. Username is root and no password.
board/qemu/m68k-mcf5208/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-m68k -M mcf5208evb -cpu m5208 -kernel ${1:-output}/images/vmlinux -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/m68k-mcf5208/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-m68k -M mcf5208evb -cpu m5208 -kernel output/images/vmlinux -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/m68k-q800/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-m68k -M q800 -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0" -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k +# You need following branch: q800-v2.11.0
board/qemu/m68k-q800/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0" - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k -You need following branch: q800-v2.11.0
board/qemu/microblazebe-mmu/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-microblaze -M petalogix-s3adsp1800 -kernel ${1:-output}/images/linux.bin -serial stdio + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/microblazebe-mmu/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-microblaze -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/microblazeel-mmu/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel ${1:-output}/images/linux.bin -serial stdio + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/microblazeel-mmu/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/mips32r2-malta/launch.sh new file +2 -0
@@ -0,0 +1,2 @@ +#!/bin/env bash +
board/qemu/mips32r2-malta/readme.txt deleted +0 -9
@@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. No keyboard support has been -enabled. - -Tested with QEMU 2.12.0
board/qemu/mips32r2el-malta/launch.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/env bash + +qemu-system-mipsel -M malta -kernel ${1:-output}/images/vmlinux -serial stdio -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. No keyboard support has been +# enabled. + +# Tested with QEMU 2.12.0
board/qemu/mips32r2el-malta/readme.txt deleted +0 -9
@@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. No keyboard support has been -enabled. - -Tested with QEMU 2.12.0
board/qemu/mips32r6-malta/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-mips -M malta -cpu mips32r6-generic -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/mips32r6-malta/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - -qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/mips32r6el-malta/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/mips32r6el-malta/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - -qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/mips64-malta/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-mips64 -M malta -kernel ${1:-output}/images/vmlinux -serial stdio -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. + +# Tested with QEMU 2.12.0
board/qemu/mips64-malta/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/mips64el-malta/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-mips64el -M malta -kernel ${1:-output}/images/vmlinux -serial stdio -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. + +# Tested with QEMU 2.12.0
board/qemu/mips64el-malta/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/mips64r6-malta/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-mips64 -M malta -cpu I6400 -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/mips64r6-malta/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/mips64r6el-malta/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-mips64el -M malta -cpu I6400 -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/mips64r6el-malta/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/nios2-10m50/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-nios2 -kernel ${1:-output}/images/vmlinux -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0.
board/qemu/nios2-10m50/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-nios2 -kernel output/images/vmlinux -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0.
board/qemu/or1k/launch.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/env bash + +qemu-system-or1k -kernel ${1:-output}/images/vmlinux -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Ethernet support is not working, yet. + +# Tested with QEMU 2.12.0.
board/qemu/or1k/readme.txt deleted +0 -9
@@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-or1k -kernel output/images/vmlinux -nographic - -The login prompt will appear in the terminal that started Qemu. - -Ethernet support is not working, yet. - -Tested with QEMU 2.12.0.
board/qemu/ppc-g3beige/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-ppc -M g3beige -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user + +# The login prompt will appear in the terminal that started Qemu. The +# graphical window is the framebuffer. + +# Tested with QEMU 2.12.0
board/qemu/ppc-g3beige/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/ppc-mac99/launch.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/env bash + +qemu-system-ppc -M mac99 -cpu g4 -m 1G -kernel ${1:-output}/images/vmlinux -drive file=${1:-output}/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" -nographic -vga none + +# Tested with QEMU 3.1.0
board/qemu/ppc-mac99/readme.txt deleted +0 -5
@@ -1,5 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" - -Tested with QEMU 3.1.0
board/qemu/ppc-mpc8544ds/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-ppc -M mpc8544ds -kernel ${1:-output}/images/vmlinux -serial stdio -net nic,model=e1000 -net user + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/ppc-mpc8544ds/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/ppc-virtex-ml507/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-ppc -M virtex-ml507 -m 256 -kernel ${1:-output}/images/vmlinux -dtb ${1:-output}/images/virtex440-ml507.dtb -append "console=ttyS0" -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/ppc-virtex-ml507/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/ppc64-e5500/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel ${1:-output}/images/uImage -drive file=${1:-output}/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/ppc64-e5500/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/ppc64-pseries/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel ${1:-output}/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=${1:-output}/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/ppc64-pseries/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/ppc64le-pseries/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel ${1:-output}/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=${1:-output}/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses + +# The login prompt will appear in the terminal window. + +# Tested with QEMU 2.12.0
board/qemu/ppc64le-pseries/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - -qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses - -The login prompt will appear in the terminal window. - -Tested with QEMU 2.12.0
board/qemu/riscv32-virt/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-riscv32 -M virt -kernel ${1:-output}/images/fw_jump.elf -device loader,file=${1:-output}/images/Image,addr=0x80400000 -append "rootwait root=/dev/vda ro" -drive file=${1:-output}/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 3.1
board/qemu/riscv32-virt/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run Linux in emulation with: - - qemu-system-riscv32 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80400000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 3.1
board/qemu/riscv64-virt/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-riscv64 -M virt -kernel ${1:-output}/images/fw_jump.elf -device loader,file=${1:-output}/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=${1:-output}/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 3.1 +
board/qemu/riscv64-virt/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run Linux in emulation with: - - qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 3.1
board/qemu/sh4-r2d/launch.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/env bash + +qemu-system-sh4 -M r2d -kernel ${1:-output}/images/zImage -drive file=${1:-output}/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user + +# The login prompt will appear in the terminal that started Qemu. +# The graphical window is the framebuffer. + +# Tested with QEMU 2.12.0 +
board/qemu/sh4-r2d/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user - -The login prompt will appear in the terminal that started Qemu. -The graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/sh4eb-r2d/launch.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/env bash + +qemu-system-sh4eb -M r2d -kernel ${1:-output}/images/zImage -drive file=${1:-output}/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user + +# The login prompt will appear in the terminal that started Qemu. +# The graphical window is the framebuffer. + +# Tested with QEMU 2.12.0
board/qemu/sh4eb-r2d/readme.txt deleted +0 -8
@@ -1,8 +0,0 @@ -Run the emulation with: - - qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user - -The login prompt will appear in the terminal that started Qemu. -The graphical window is the framebuffer. - -Tested with QEMU 2.12.0
board/qemu/sparc-ss10/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-sparc -M SS-10 -kernel ${1:-output}/images/zImage -drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/sparc-ss10/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/sparc64-sun4u/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-sparc64 -M sun4u -kernel ${1:-output}/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=${1:-output}/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/sparc64-sun4u/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
board/qemu/x86/launch.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/env bash + +qemu-system-i386 -M pc -kernel ${1:-output}/images/bzImage -drive file=${1:-output}/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user + +# Optionally add -smp N to emulate a SMP system with N CPUs. + +# The login prompt will appear in the graphical window. + +# Tested with QEMU 2.12.0
board/qemu/x86/readme.txt deleted +0 -9
@@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user - -Optionally add -smp N to emulate a SMP system with N CPUs. - -The login prompt will appear in the graphical window. - -Tested with QEMU 2.12.0
board/qemu/x86_64/launch.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/env bash + +qemu-system-x86_64 -M pc -kernel ${1:-output}/images/bzImage -drive file=${1:-output}/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user + +# Optionally add -smp N to emulate a SMP system with N CPUs. + +# The login prompt will appear in the graphical window. + +# Tested with QEMU 2.12.0
board/qemu/x86_64/readme.txt deleted +0 -9
@@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user - -Optionally add -smp N to emulate a SMP system with N CPUs. - -The login prompt will appear in the graphical window. - -Tested with QEMU 2.12.0
board/qemu/xtensa-lx60/launch.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/env bash + +qemu-system-xtensa -M lx60 -cpu dc233c -kernel ${1:-output}/images/Image.elf -monitor null -nographic + +# The login prompt will appear in the terminal that started Qemu. + +# Tested with QEMU 2.12.0
board/qemu/xtensa-lx60/readme.txt deleted +0 -7
@@ -1,7 +0,0 @@ -Run the emulation with: - - qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf - -The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0
Signature · 1 line
2.21.0
PATCH v3 8/11 board/qemu/*/launch.sh: add qemu launch script
Hi,
Le 17/11/2019 ? 21:19, Romain Naour a ?crit?:
Quoted 25 lines
From: Jugurtha BELKALEM <[email protected]>
It is not very convenient for Buildroot users to store the Qemu command line in a readme.txt instead of a script to be used as soon as the Qemu image has been created.
This patch replace the readme.txt file located in board/qemu/<Qemu target>/ by a script (
launch.sh).This allow Buildroot user to start easily Qemu using only one simple command:
$ ./board/qemu/aarch64-virt/launch.sh test/qemu_aarch64_virt/Signed-off-by Jugurtha BELKALEM <[email protected]>Signed-off-by Romain Naour <[email protected]>---
board/qemu/mips32r2-malta/launch.sh new file +0
-0
board/qemu/mips32r2-malta/launch.sh line 2
Quoted 2 lines
board/qemu/mips32r2-malta/launch.sh new file +2
-0@@ -0,0 +1,2 @@ +#!/bin/env bash +
The content of this script is missing, it should be:
qemu-system-mips -M malta -kernel ${1:-output}/images/vmlinux -serial stdio
-drive file=${1:-output}/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user
# The login prompt will appear in the terminal that started Qemu. The
# graphical window is the framebuffer. No keyboard support has been # enabled.
# Tested with QEMU 2.12.0
It's fixed for v4.
Best regards,
Romain
Quoted 15 lines
board/qemu/mips32r2-malta/readme.txt deleted +0
-9@@ -1,9 +0,0 @@ -Run the emulation with: - - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user - -The login prompt will appear in the terminal that started Qemu. The -graphical window is the framebuffer. No keyboard support has been -enabled. - -Tested with QEMU 2.12.0
PATCH v3 9/11 configs/qemu-*: add a comment to provide the path launch.sh script for each Qemu defconfig
In reply to Romain NaourThis comment could be useful to point peoples at the script to start Qemu but also for a script used in a automated CI (gitlab).
The path provided in the defconfig allow to "link" explicitely a Qemu defconfig and it's Qemu command line.
--- configs/qemu_aarch64_virt_defconfig | 2 ++ configs/qemu_arm_versatile_defconfig | 2 ++ configs/qemu_arm_versatile_nommu_defconfig | 2 ++ configs/qemu_arm_vexpress_defconfig | 2 ++ configs/qemu_arm_vexpress_tz_defconfig | 2 ++ configs/qemu_csky610_virt_defconfig | 2 ++ configs/qemu_csky807_virt_defconfig | 2 ++ configs/qemu_csky810_virt_defconfig | 2 ++ configs/qemu_csky860_virt_defconfig | 2 ++ configs/qemu_m68k_mcf5208_defconfig | 2 ++ configs/qemu_m68k_q800_defconfig | 2 ++ configs/qemu_microblazebe_mmu_defconfig | 2 ++ configs/qemu_microblazeel_mmu_defconfig | 2 ++ configs/qemu_mips32r2_malta_defconfig | 2 ++ configs/qemu_mips32r2el_malta_defconfig | 2 ++ configs/qemu_mips32r6_malta_defconfig | 2 ++ configs/qemu_mips32r6el_malta_defconfig | 2 ++ configs/qemu_mips64_malta_defconfig | 2 ++ configs/qemu_mips64el_malta_defconfig | 2 ++ configs/qemu_mips64r6_malta_defconfig | 2 ++ configs/qemu_mips64r6el_malta_defconfig | 2 ++ configs/qemu_nios2_10m50_defconfig | 2 ++ configs/qemu_or1k_defconfig | 2 ++ configs/qemu_ppc64_e5500_defconfig | 2 ++ configs/qemu_ppc64_pseries_defconfig | 2 ++ configs/qemu_ppc64le_pseries_defconfig | 2 ++ configs/qemu_ppc_g3beige_defconfig | 2 ++ configs/qemu_ppc_mac99_defconfig | 2 ++ configs/qemu_ppc_mpc8544ds_defconfig | 2 ++ configs/qemu_ppc_virtex_ml507_defconfig | 2 ++ configs/qemu_riscv32_virt_defconfig | 2 ++ configs/qemu_riscv64_virt_defconfig | 2 ++ configs/qemu_sh4_r2d_defconfig | 2 ++ configs/qemu_sh4eb_r2d_defconfig | 2 ++ configs/qemu_sparc64_sun4u_defconfig | 2 ++ configs/qemu_sparc_ss10_defconfig | 2 ++ configs/qemu_x86_64_defconfig | 2 ++ configs/qemu_x86_defconfig | 2 ++ configs/qemu_xtensa_lx60_defconfig | 2 ++ configs/qemu_xtensa_lx60_nommu_defconfig | 2 ++ 40 files changed, 80 insertions(+)
configs/qemu_aarch64_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/aarch64-virt/launch.sh + # Architecture BR2_aarch64=y BR2_cortex_a53=y
configs/qemu_arm_versatile_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/arm-versatile/launch.sh + # Architecture BR2_arm=y BR2_arm926t=y
configs/qemu_arm_versatile_nommu_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/arm-versatile-nommu/launch.sh + # Architecture BR2_arm=y BR2_arm926t=y
configs/qemu_arm_vexpress_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/arm-vexpress/launch.sh + # Architecture BR2_arm=y BR2_cortex_a9=y
configs/qemu_arm_vexpress_tz_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/arm-vexpress-tz/launch.sh + # Architecture BR2_arm=y BR2_cortex_a15=y
configs/qemu_csky610_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/csky610-virt/launch.sh + # Architecture BR2_csky=y BR2_ck610=y
configs/qemu_csky807_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/csky807-virt/launch.sh + # Architecture BR2_csky=y BR2_ck807=y
configs/qemu_csky810_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/csky810-virt/launch.sh + # Architecture BR2_csky=y BR2_ck810=y
configs/qemu_csky860_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/csky860-virt/launch.sh + # Architecture BR2_csky=y BR2_ck860=y
configs/qemu_m68k_mcf5208_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/m68k-mcf5208/launch.sh + # Architecture BR2_m68k=y BR2_m68k_cf5208=y
configs/qemu_m68k_q800_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/m68k-q800/launch.sh + # Architecture BR2_m68k=y BR2_m68k_68040=y
configs/qemu_microblazebe_mmu_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/microblazebe-mmu/launch.sh + # Architecture BR2_microblaze=y BR2_microblazebe=y
configs/qemu_microblazeel_mmu_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/microblazeel-mmu/launch.sh + # Architecture BR2_microblaze=y BR2_microblazeel=y
configs/qemu_mips32r2_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips32r2-malta/launch.sh + # Architecture BR2_mips=y BR2_mips_32r2=y
configs/qemu_mips32r2el_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips32r2el-malta/launch.sh + # Architecture BR2_mipsel=y BR2_mips_32r2=y
configs/qemu_mips32r6_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips32r6-malta/launch.sh + # Architecture BR2_mips=y BR2_mips_32r6=y
configs/qemu_mips32r6el_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips32r6el-malta/launch.sh + # Architecture BR2_mipsel=y BR2_mips_32r6=y
configs/qemu_mips64_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips64-malta/launch.sh + # Architecture BR2_mips64=y BR2_MIPS_NABI64=y
configs/qemu_mips64el_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips64el-malta/launch.sh + # Architecture BR2_mips64el=y BR2_MIPS_NABI64=y
configs/qemu_mips64r6_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips64r6-malta/launch.sh + # Architecture BR2_mips64=y BR2_mips_64r6=y
configs/qemu_mips64r6el_malta_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/mips64r6el-malta/launch.sh + # Architecture BR2_mips64el=y BR2_mips_64r6=y
configs/qemu_nios2_10m50_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/nios2-10m50/launch.sh + BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y
configs/qemu_or1k_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/or1k/launch.sh + # Architecture BR2_or1k=y
configs/qemu_ppc64_e5500_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc64-e5500/launch.sh + # Architecture BR2_powerpc64=y BR2_powerpc_e5500=y
configs/qemu_ppc64_pseries_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc64-pseries/launch.sh + # Architecture BR2_powerpc64=y BR2_powerpc_power7=y
configs/qemu_ppc64le_pseries_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc64le-pseries/launch.sh + # Architecture BR2_powerpc64le=y BR2_powerpc_power8=y
configs/qemu_ppc_g3beige_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc-g3beige/launch.sh + # Architecture BR2_powerpc=y BR2_powerpc_750=y
configs/qemu_ppc_mac99_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc-mac99/launch.sh + BR2_powerpc=y BR2_powerpc_7400=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
configs/qemu_ppc_mpc8544ds_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc-mpc8544ds/launch.sh + # Architecture BR2_powerpc=y BR2_powerpc_8548=y
configs/qemu_ppc_virtex_ml507_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/ppc-virtex-ml507/launch.sh + # Architecture BR2_powerpc=y BR2_powerpc_440=y
configs/qemu_riscv32_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/riscv32-virt/launch.sh + # Architecture BR2_riscv=y BR2_RISCV_32=y
configs/qemu_riscv64_virt_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/riscv64-virt/launch.sh + # Architecture BR2_riscv=y BR2_RISCV_64=y
configs/qemu_sh4_r2d_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/sh4-r2d/launch.sh + # Architecture BR2_sh=y BR2_sh4=y
configs/qemu_sh4eb_r2d_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/sh4eb-r2d/launch.sh + # Architecture BR2_sh=y BR2_sh4eb=y
configs/qemu_sparc64_sun4u_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/sparc64-sun4u/launch.sh + # Architecture BR2_sparc64=y BR2_sparc_v9=y
configs/qemu_sparc_ss10_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/sparc-ss10/launch.sh + # Architecture BR2_sparc=y BR2_sparc_v8=y
configs/qemu_x86_64_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/x86_64/launch.sh + # Architecture BR2_x86_64=y
configs/qemu_x86_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/x86/launch.sh + # Architecture BR2_i386=y BR2_x86_pentiumpro=y
configs/qemu_xtensa_lx60_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/xtensa-lx60/launch.sh + # Architecture BR2_xtensa=y BR2_XTENSA_CUSTOM=y
configs/qemu_xtensa_lx60_nommu_defconfig +2 -0
@@ -1,3 +1,5 @@ +# To start Qemu, use the Qemu command line from: board/qemu/xtensa-lx60/launch.sh + # Architecture BR2_xtensa=y BR2_XTENSA_CUSTOM=y
Signature · 1 line
2.21.0
PATCH v3 10/11 support/scripts/boot-qemu-image.py: boot Qemu images with Qemu-system.
In reply to Romain NaourFrom: Jugurtha BELKALEM <[email protected]>
This script is intended to be used by gitlab CI to test at runtime Qemu images generated by Buildroot's Qemu defconfigs.
This allows to troubleshoot different issues that may be associated with defective builds by lanching a qemu machine, sending root password, waiting for login shell and then perform a shutdown.
This script is inspired by toolchain builder [1] and the Buildroot testing infrastructure.
Usage: boot-qemu-image.py <qemu_arch_defconfig>
The gitlab CI will call this script for each defconfig build but only Qemu defconfig will be runtime tested, all others defconfig are ignored. The script retrieve the patch to the launch.sh script that contain the Qemu command ligne. The launch.sh script is no executed directly since we need to tweak some Qemu options (remove serial port redirection, disable graphic support...).
The script check is the corresponding Qemu binary (qemu-system) is available, either built by Buildroot or available from the host. Some Qemu defconfig must be used with a specific Qemu version (fork) that is not always available. The script doesn't error out when qemu-system is missing but a message is added in a log.
Finally, the script start Qemu like it's done for the Buildroot testing infrastructure (using pexpect).
Note:
We noticed some timeout issues with pexpect when the Qemu machine is powered off. That's because Qemu process doesn't stop even if the system is halted (after "System halted"). So the script doesn't error out when such timeout occure. The behaviour depends on the architecture emulated by Qemu.
[1] https://github.com/bootlin/toolchains-builder/blob/master/build.sh
--- support/scripts/boot-qemu-image.py | 109 +++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100755 support/scripts/boot-qemu-image.py
support/scripts/boot-qemu-image.py new file +109 -0
@@ -0,0 +1,109 @@ +#!/usr/bin/env python3 + +import pexpect +import sys +import os +import re +import shlex +import shutil +import subprocess + +argc = len(sys.argv) +if not (argc == 2): + print("Error: incorrect number of arguments") + print("""Usage: boot-qemu-image.py <qemu_arch_defconfig>""") + sys.exit(1) + +defconfig_filename = sys.argv[1] + +# Ignore non Qemu defconfig +if defconfig_filename.startswith('qemu_') is False: + sys.exit(0) + +# This script expect to run from the Buildroot top directory. +defconfig_filepath = os.path.join(os.getcwd(), 'configs', defconfig_filename) + +with open(defconfig_filepath, 'r') as defconfig_file: + # read only the first line and keep the path to launch.sh script. + launch_filepath = defconfig_file.readline().split(":")[1].strip() + +qemu_cmd = "" + +with open(launch_filepath, 'r') as launch_file: + for line in launch_file: + if re.search("qemu-system", line): + qemu_cmd = line + break + +if not qemu_cmd: + print("Error: No QEMU command line found in " + defconfig_filename) + sys.exit(1) + +# Replace bashism +qemu_cmd = line.replace("${1:-output}", "output") + +# Remove -serial stdio if present +qemu_cmd = qemu_cmd.replace("-serial stdio", "") + +# Special case for SH4 -display none +if defconfig_filename.startswith('qemu_sh4') is True: + qemu_cmd += "-serial stdio -display none" +else: + qemu_cmd += "-nographic" + +# pexpect needs a list, convert a sting to a list and escape quoted substring. +qemu_cmd = shlex.split(qemu_cmd) + +# Use host Qemu if provided by Buildroot. +os.environ["PATH"] = os.getcwd() + "/output/host/bin" + os.pathsep + os.environ["PATH"] + +# Ignore when no Qemu emulation is available +if not shutil.which(qemu_cmd[0]): + print("No " + qemu_cmd[0] + " binary available, THIS DEFCONFIG CAN NOT BE TESTED!") + sys.exit(0) + + +def main(): + global child + + try: + child.expect(["buildroot login:", pexpect.TIMEOUT], timeout=60) + except pexpect.EOF: + print("Connection problem, exiting.") + sys.exit(1) + except pexpect.TIMEOUT: + print("System did not boot in time, exiting.") + sys.exit(1) + + child.sendline("root\r") + + try: + child.expect(["# ", pexpect.TIMEOUT], timeout=60) + except pexpect.EOF: + print("Cannot connect to shell") + sys.exit(1) + except pexpect.TIMEOUT: + print("Timeout while waiting for shell") + sys.exit(1) + + child.sendline("poweroff\r") + + try: + child.expect(["System halted", pexpect.TIMEOUT], timeout=60) + child.expect(pexpect.EOF) + except pexpect.EOF: + sys.exit(0) + except pexpect.TIMEOUT: + print("Cannot halt machine") + # Qemu may not exit properly after "System halted", ignore. + sys.exit(0) + + +# Log the Qemu version +subprocess.call([qemu_cmd[0], "--version"]) + +child = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5, encoding='utf-8', + env={"QEMU_AUDIO_DRV": "none", 'PATH': os.environ["PATH"]}) +# We want only stdout into the log to avoid double echo +child.logfile = sys.stdout +main()
Signature · 1 line
2.21.0
PATCH v3 11/11 gitlab.yml.in*: enable Qemu gitlab testing
In reply to Romain NaourFrom: Jugurtha BELKALEM <[email protected]>
Used to launch qemu tests for various qemu architectures. Neverthless to say that this file skips any other job different from qemu (only qemu configurations are runtime tested).
Add the log generated by Qemu to the build artefacts.
--- .gitlab-ci.yml | 7 +++++++ .gitlab-ci.yml.in | 7 +++++++ 2 files changed, 14 insertions(+)
.gitlab-ci.yml +7 -0
@@ -54,6 +54,12 @@ check-package: tail -200 build.log exit 1 } + - | + ./support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || { + echo 'Failed runtime test last output' + tail -200 runtime-test.log + exit 1 + } artifacts: when: always expire_in: 2 weeks
@@ -64,6 +70,7 @@ check-package: - output/build/build-time.log - output/build/packages-file-list.txt - output/build/*/.config + - runtime-test.log .defconfig: extends: .defconfig_base
.gitlab-ci.yml.in +7 -0
@@ -54,6 +54,12 @@ check-package: tail -200 build.log exit 1 } + - | + ./support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || { + echo 'Failed runtime test last output' + tail -200 runtime-test.log + exit 1 + } artifacts: when: always expire_in: 2 weeks
@@ -64,6 +70,7 @@ check-package: - output/build/build-time.log - output/build/packages-file-list.txt - output/build/*/.config + - runtime-test.log .defconfig: extends: .defconfig_base
Signature · 1 line
2.21.0
v3 cover gitlab Qemu runtime testing
In reply to Romain NaourHi,
Le 17/11/2019 ? 21:18, Romain Naour a ?crit?:
Quoted 12 lines
This new iteration take into account the previous review with some additional rework.
This series start by removing useless host-qemu build for
m68k_q800, enable serial console for x86/x86_64 and some refactoring for csky and arm-versatile.Replace the readme.txt file by a bash script that ease starting Qemu. Then a new comment is added to each Qemu defconfig files in order to provide the path to this new script.
This path help to link each Qemu defconfig with it's own script.
Quoted 7 lines
Add new python script to be used by gitlab to start Qemu when a Qemu defconfig is built.
Finally add this new python script to .gitlab-ci.yml.
http://lists.busybox.net/pipermail/buildroot/2019-May/249432.html
I discussed about this series with Jeremy and he suggest to add the Qemu command line into the Qemu's defconfig file (add a new Kconfig option). With that, we can even add a new Makefile target "make run-qemu" to start Qemu when the Qemu command line is set in the defconfig (this would avoid adding several launch.sh script).
Thought ?
Best regards,
Romain
v3 cover gitlab Qemu runtime testing
Quoted 20 lines · Romain Naour
Hi,
Le 17/11/2019 ? 21:18, Romain Naour a ?crit?:
Quoted 17 lines
This new iteration take into account the previous review with some additional rework.
This series start by removing useless host-qemu build for
m68k_q800, enable serial console for x86/x86_64 and some refactoring for csky and arm-versatile.Replace the readme.txt file by a bash script that ease starting Qemu. Then a new comment is added to each Qemu defconfig files in order to provide the path to this new script.
This path help to link each Qemu defconfig with it's own script.Add new python script to be used by gitlab to start Qemu when a Qemu defconfig is built.
Finally add this new python script to .gitlab-ci.yml.
Quoted 8 lines
I discussed about this series with Jeremy and he suggest to add the Qemu command line into the Qemu's defconfig file (add a new
Kconfigoption). With that, we can even add a newMakefiletarget "make run-qemu" to start Qemu when the Qemu command line is set in the defconfig (this would avoid adding severallaunch.shscript).
So something like
config BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS
string "qemu launch command"
help
Command to launch qemu. If this is defined, 'make run-qemu' can be used to build everything and launch qemu.
HOST_QEMU_LAUNCH_ARGS = $(call qstrip,$(BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS)) ifneq ($(HOST_QEMU_LAUNCH_ARGS),)
run-qemu: world
$(Q)$(HOST_QEMU) <kernel args> <rootfs args> $(HOST_QEMU_LAUNCH_ARGS)
endif
Looks like a good idea indeed!
Regards,
Arnout
v3 cover gitlab Qemu runtime testing
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Hi,
Quoted 15 lines
Quoted 5 lines
I discussed about this series with Jeremy and he suggest to add the Qemu command line into the Qemu's defconfig file (add a new
Kconfigoption). With that, we can even add a newMakefiletarget "make run-qemu" to start Qemu when the Qemu command line is set in the defconfig (this would avoid adding severallaunch.shscript).So something like
config
BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS
string "qemu launch command"
help
Command to launch qemu. If this is defined, 'make run-qemu' can be used to build everything and launch qemu.
Quoted 7 lines
HOST_QEMU_LAUNCH_ARGS= $(call qstrip,$(BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS)) ifneq ($(HOST_QEMU_LAUNCH_ARGS),)
run-qemu: world$(Q)$(HOST_QEMU) <kernel args> <rootfs args> $(HOST_QEMU_LAUNCH_ARGS)endif
Looks like a good idea indeed!
Cute. The kernel arguments (-kernel path/to/kernel/image) could indeed probably be standardized, but we do some to have quite some variation in the rootfs arguments.
But OK, we could start with just including the rootfs argument in _LAUNCH_ARGS.
Signature · 1 line
Bye, Peter Korsgaard
v3 cover gitlab Qemu runtime testing
Hi,
Le 19/12/2019 ? 12:11, Peter Korsgaard a ?crit?:
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Hi,
Quoted 20 lines
Quoted 5 lines
I discussed about this series with Jeremy and he suggest to add the Qemu command line into the Qemu's defconfig file (add a new
Kconfigoption). With that, we can even add a newMakefiletarget "make run-qemu" to start Qemu when the Qemu command line is set in the defconfig (this would avoid adding severallaunch.shscript).So something like
config
BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS
string "qemu launch command"
help
Command to launch qemu. If this is defined, 'make run-qemu' can be used to build everything and launch qemu.
HOST_QEMU_LAUNCH_ARGS= $(call qstrip,$(BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS)) ifneq ($(HOST_QEMU_LAUNCH_ARGS),)
run-qemu: world$(Q)$(HOST_QEMU) <kernel args> <rootfs args> $(HOST_QEMU_LAUNCH_ARGS)endif
Quoted 9 lines
Quoted 1 line
Looks like a good idea indeed!
Cute. The kernel arguments (-kernel path/to/kernel/image) could indeed probably be standardized, but we do some to have quite some variation in the rootfs arguments.
But OK, we could start with just including the rootfs argument in
_LAUNCH_ARGS.
About the qemu-system-* binary, should we use the one from the host or use the one from the host-qemu package? (or it depend?)
It can be convenient to use the Qemu provided by the host since it can provide full feature support. The Qemu provided by host-qemu only support some dependencies but not all.
On the other hand, the user can still use the qemu-system-* he want by not using make run-qemu but using the qemu command line in the console.
Best regards,
Romain
v3 cover gitlab Qemu runtime testing
Quoted 41 lines · Romain Naour
Hi,
Le 19/12/2019 ? 12:11, Peter Korsgaard a ?crit?:
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Hi,
Quoted 20 lines
Quoted 5 lines
I discussed about this series with Jeremy and he suggest to add the Qemu command line into the Qemu's defconfig file (add a new
Kconfigoption). With that, we can even add a newMakefiletarget "make run-qemu" to start Qemu when the Qemu command line is set in the defconfig (this would avoid adding severallaunch.shscript).So something like
config
BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS
string "qemu launch command"
help
Command to launch qemu. If this is defined, 'make run-qemu' can be used to build everything and launch qemu.
HOST_QEMU_LAUNCH_ARGS= $(call qstrip,$(BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS)) ifneq ($(HOST_QEMU_LAUNCH_ARGS),)
run-qemu: world$(Q)$(HOST_QEMU) <kernel args> <rootfs args> $(HOST_QEMU_LAUNCH_ARGS)endif
Quoted 9 lines
Quoted 1 line
Looks like a good idea indeed!
Cute. The kernel arguments (-kernel path/to/kernel/image) could indeed probably be standardized, but we do some to have quite some variation in the rootfs arguments.
But OK, we could start with just including the rootfs argument in
_LAUNCH_ARGS.About the qemu-system-* binary, should we use the one from the host or use the one from the host-qemu package? (or it depend?)
Quoted 6 lines
It can be convenient to use the Qemu provided by the host since it can provide full feature support. The Qemu provided by host-qemu only support some dependencies but not all.
On the other hand, the user can still use the qemu-system-* he want by not using make run-qemu but using the qemu command line in the console.
Indeed. I think the 'run-qemu' should be something completely self-contained
and not rely on anything on the build machine.
So I think we should use host-qemu.
Regards,
Arnout
v3 cover gitlab Qemu runtime testing
Arnout, All,
Le 04/02/2020 ? 15:31, Arnout Vandecappelle a ?crit?:
Quoted 48 lines · Romain Naour
Quoted 45 lines
Hi,
Le 19/12/2019 ? 12:11, Peter Korsgaard a ?crit?:
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Hi,
Quoted 20 lines
Quoted 5 lines
I discussed about this series with Jeremy and he suggest to add the Qemu command line into the Qemu's defconfig file (add a new
Kconfigoption). With that, we can even add a newMakefiletarget "make run-qemu" to start Qemu when the Qemu command line is set in the defconfig (this would avoid adding severallaunch.shscript).So something like
config
BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS
string "qemu launch command"
help
Command to launch qemu. If this is defined, 'make run-qemu' can be used to build everything and launch qemu.
HOST_QEMU_LAUNCH_ARGS= $(call qstrip,$(BR2_PACKAGE_HOST_QEMU_LAUNCH_ARGS)) ifneq ($(HOST_QEMU_LAUNCH_ARGS),)
run-qemu: world$(Q)$(HOST_QEMU) <kernel args> <rootfs args> $(HOST_QEMU_LAUNCH_ARGS)endif
Quoted 9 lines
Quoted 1 line
Looks like a good idea indeed!
Cute. The kernel arguments (-kernel path/to/kernel/image) could indeed probably be standardized, but we do some to have quite some variation in the rootfs arguments.
But OK, we could start with just including the rootfs argument in
_LAUNCH_ARGS.About the qemu-system-* binary, should we use the one from the host or use the one from the host-qemu package? (or it depend?)
It can be convenient to use the Qemu provided by the host since it can provide full feature support. The Qemu provided by host-qemu only support some dependencies but not all.
Quoted 7 lines
Quoted 2 lines
On the other hand, the user can still use the qemu-system-* he want by not using make run-qemu but using the qemu command line in the console.
Indeed. I think the 'run-qemu' should be something completely self-contained
and not rely on anything on the build machine.So I think we should use host-qemu.
Ok.
With Yann, we discussed about why adding the qemu command line in the defconfig may be not a good idea for several reasons:
- The defconfig file contains information that is used during the build, while running qemu is not part of the build itself.
- The readme.txt file is a documentation file that explain how to start and test the system under Qemu. A script is not documentation that we can refer users to.
Most of the following is reasoning by Yann (and reviewed/reworked by him IRL):
We could instead use a post-build script to generate the launch.sh script into the output directory. Thus, the script is in a know location (output/images/launch.sh).
We still need to retrieve the command line from the readme.txt from the board/qemu/<qemu target>/. We have to make sure to extract the Qemu command line to be used by the script, and no a any other text present in the readme.txt.
Some readme.txt files have multiple qemu command lines, either for various configurations (e.g. csky, one for each defconfig), or for various conditions (e.g. the ARM V-Express TrustZone cases).
we could add a tag with the name of the defconfig file in front of each command line in order to extract the right qemu command line. For example:
qemu_x86_defconfig: qemu-system-i386 -M pc -kernel output/images/bzImage \
-drive file=output/images/rootfs.ext2,if=virtio,format=raw -append \
"rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio \
-net nic,model=virtio -net userEventually, the user can easily run that script directly from output/build/maunch.sh (or whatever we call it). Same goes for the testing infrastructure.
And for the infrastructure, the launcher.sh can be templatised with smartness to remove or add incompatible options (e.g. remove -serial stdio, or force -nographics).
Thoughts?
(Yann yields Romain's keyboard now ;-] )
Best regards,
Romain and Yann.
Quoted 3 lines
Regards,
Arnout