commit bc9c5a4dc38b28fcbbb2a18dd05ed58640f8fe92
author Tomasz Jeznach <tjeznach@chromium.org> Thu Jan 30 10:19:40 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Thu May 28 18:51:01 2020 +0000
tree d3d1700643a9962c136bf62449581c11b1fb8917
parent 9c7529d1f7b475e61c7583a6eec11f0a818f6aaf

update_kernel: Enable hypervisor boot support.

Enable support for hypervisor kernel updates.
Use --nohv option to disable hypervisor kernel
for boards supporting it.

BUG=b:145357269
TEST=build and update kernel with and without hv.

Change-Id: I468809b001e7a7090caaf6d5b29f1a9ffc41080c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2140027
Tested-by: Tomasz Jeznach <tjeznach@chromium.org>
Commit-Queue: Tomasz Jeznach <tjeznach@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

update_kernel.sh

diff --git a/update_kernel.sh b/update_kernel.sh
index 44b66f8..5a9292d 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -20,6 +20,7 @@
 DEFINE_string rootfs "" "Override rootfs partition reported by target"
 DEFINE_string arch "" "Override architecture reported by target"
 DEFINE_boolean clean $FLAGS_FALSE "Remove old files before sending new files"
+DEFINE_boolean hv $FLAGS_TRUE "Use hypervisor kernel if available."
 DEFINE_boolean ignore_verity $FLAGS_FALSE "Update kernel even if system is using verity"
 DEFINE_boolean reboot $FLAGS_TRUE "Reboot system after update"
 DEFINE_boolean vboot $FLAGS_TRUE "Update the vboot kernel"
@@ -153,6 +154,7 @@
 make_kernelimage() {
   local bootloader_path
   local kernel_image
+  local boot_path="/build/${FLAGS_board}/boot"
   local config_path="$(mktemp /tmp/config.txt.XXXXX)"
   if [[ "${FLAGS_arch}" == "arm" || "${FLAGS_arch}" == "arm64" ]]; then
     name="bootloader.bin"
@@ -165,10 +167,13 @@
       bootloader_path="${TMP}/${name}"
       truncate -s 512 "${bootloader_path}"
     fi
-    kernel_image="/build/${FLAGS_board}/boot/vmlinux.uimg"
+    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="/build/${FLAGS_board}/boot/vmlinuz"
+    kernel_image="${boot_path}/vmlinuz"
   fi
   get_bootargs > "${config_path}"
   vbutil_kernel --pack $TMP/new_kern.bin \