From 829b4731df9913741818986d5338d95d3f59d656 Mon Sep 17 00:00:00 2001 From: Michal Orzel Date: Fri, 24 Nov 2023 13:09:07 +0100 Subject: [PATCH] automation: Switch u-boot boot command to bootz for arm32 tests Thanks to recent changes added to ImageBuilder to support the bootz command, which allows obtaining the effective image size (including NOLOAD sections) from the zImage header, switch the BOOT_CMD for arm32 tests to bootz. Among other scenarios, this change will enable us, in the future, to add tests with UBSAN enabled Xen, which would otherwise fail due to incorrect image placement resulting in overlapping. Signed-off-by: Michal Orzel Acked-by: Stefano Stabellini --- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index a4b487b080..d916489056 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -68,7 +68,7 @@ XEN_CMD="console=dtuart dom0_mem=1024M bootscrub=0 console_timestamps=boot" NUM_DOMUS=0 LOAD_CMD="tftpb" -BOOT_CMD="bootm" +BOOT_CMD="bootz" UBOOT_SOURCE="boot.source" UBOOT_SCRIPT="boot.scr"' > config diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 7e3cfbe9c4..e31b6b9014 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -101,7 +101,7 @@ DOMU_MEM[0]="512" NUM_DOMUS=1 LOAD_CMD="tftpb" -BOOT_CMD="bootm" +BOOT_CMD="bootz" UBOOT_SOURCE="boot.source" UBOOT_SCRIPT="boot.scr"' > config