diff options
| author |  Romain Naour <romain.naour@gmail.com> | 2020-11-24 21:30:22 +0100 |
|---|---|---|
| committer |  Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2020-12-05 22:35:07 +0100 |
| commit | 16430fd8c607eec3e4447d67317e4af858ec4217 (patch) | |
| tree | be5312444995ea3bced95ec598865860311a2c74 /board/qemu | |
| parent | 3fc3289a3f83e1b8193a34e2b48957034deaa873 (diff) | |
| download | buildroot-16430fd8c607eec3e4447d67317e4af858ec4217.tar.gz buildroot-16430fd8c607eec3e4447d67317e4af858ec4217.tar.bz2 | |
configs/qemu_arm_vexpress_tz_defconfig: build start-qemu.sh
When tags was added by commit 011206b2bffd509b29365bc1eaa761414ee13726
to detect the qemu command line, the qemu_arm_vexpress_tz_defconfig
was ignored due to a build issue.
This build issue has been fixed by previous patches, so we can
enable the runtime testing by adding the tag in the readme.txt
and the post-image script in the defconfig.
Since Qemu from HOST_DIR is now executed directly from BINARIES_DIR,
we can remove all the string before "qemu-system-*".
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'board/qemu')
| -rw-r--r-- | board/qemu/arm-vexpress-tz/readme.txt | 2 | ||||
| -rwxr-xr-x | board/qemu/post-image.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index b235ba5cd7..abce750291 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -18,7 +18,7 @@ secure and non-secure worlds. -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ -semihosting-config enable,target=native \ - -bios bl1.bin + -bios bl1.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear in the terminal that started QEMU. diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh index 404f77411c..88f0413496 100755 --- a/board/qemu/post-image.sh +++ b/board/qemu/post-image.sh @@ -27,6 +27,9 @@ QEMU_CMD_LINE="${QEMU_CMD_LINE//output\/images\//}" DEFAULT_ARGS="$(sed -r -e '/-serial stdio/!d; s/.*(-serial stdio).*/\1/' <<<"${QEMU_CMD_LINE}")" QEMU_CMD_LINE="${QEMU_CMD_LINE//-serial stdio/}" +# Remove any string before qemu-system-* +QEMU_CMD_LINE="$(sed -r -e 's/^.*(qemu-system-)/\1/' <<<"${QEMU_CMD_LINE}")" + # Disable graphical output and redirect serial I/Os to console case ${DEFCONFIG_NAME} in (qemu_sh4eb_r2d_defconfig|qemu_sh4_r2d_defconfig) |