@@ -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.
@@ -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 sting 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)
@@ -43,6 +43,10 @@ BR2_PACKAGE_OPTEE_BENCHMARK=y
BR2_PACKAGE_OPTEE_EXAMPLES=y
BR2_PACKAGE_OPTEE_TEST=y
+# Image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
+
# U-boot for booting the dear Linux kernel
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
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> --- Tested with: https://gitlab.com/kubu93/buildroot/-/pipelines/220213431 v4: fix string removal before "qemu-system-*" v3: rebase on top of previous patch --- board/qemu/arm-vexpress-tz/readme.txt | 2 +- board/qemu/post-image.sh | 3 +++ configs/qemu_arm_vexpress_tz_defconfig | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-)