update_kernel: Enable hypervisor boot support on ARM
We already have --[no]hv for x86, just adding an effect of that flag for
ARM as well.
BUG=b:145357269
TEST=tested with some cheza64/trogdor CLs for ManaTEE
Change-Id: I7318f48b9832956c31a06fd6555a93348939e33e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2401963
Tested-by: Micah Morton <mortonm@chromium.org>
Reviewed-by: Tomasz Jeznach <tjeznach@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/update_kernel.sh b/update_kernel.sh
index 5a9292d..f872208 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -156,6 +156,9 @@
local kernel_image
local boot_path="/build/${FLAGS_board}/boot"
local config_path="$(mktemp /tmp/config.txt.XXXXX)"
+ if [[ ${FLAGS_hv} -eq ${FLAGS_TRUE} && -d "${boot_path}/hv" ]]; then
+ boot_path+="/hv"
+ fi
if [[ "${FLAGS_arch}" == "arm" || "${FLAGS_arch}" == "arm64" ]]; then
name="bootloader.bin"
bootloader_path="${SRC_ROOT}/build/images/${FLAGS_board}/latest/${name}"
@@ -168,9 +171,6 @@
truncate -s 512 "${bootloader_path}"
fi
kernel_image="${boot_path}/vmlinux.uimg"
- elif [[ ${FLAGS_hv} -eq ${FLAGS_TRUE} && -d "${boot_path}/hv" ]]; then
- bootloader_path="/lib64/bootstub/bootstub.efi"
- kernel_image="${boot_path}/hv/vmlinuz"
else
bootloader_path="/lib64/bootstub/bootstub.efi"
kernel_image="${boot_path}/vmlinuz"