commit 7c5da87735c57f62653f7792bc76c7d318f4f596
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 10 06:02:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 10 06:02:54 2021 +0000
tree d33f3c28e685563539dd45f77a9699a3594796f7
parent f8d941138dc0da9a1bf4a1de0e3ef9b626cd8898
parent 855e6f9a2a25a6bd88b701c37b1c56cd1e67d62f

Merge "Use the new verified_boot_android command"

microdroid/uboot-env-x86_64.txt

diff --git a/microdroid/uboot-env-x86_64.txt b/microdroid/uboot-env-x86_64.txt
index fabe5b4..0064cac 100644
--- a/microdroid/uboot-env-x86_64.txt
+++ b/microdroid/uboot-env-x86_64.txt
@@ -3,7 +3,7 @@
 # Boot the device following the Android boot procedure
 # `0` is the disk number of os_composite.img
 # `a` and `_a` are the slot index for A/B
-bootcmd=avb init virtio 0 && avb verify _a && env set bootargs "$bootargs $avb_bootargs" && boot_android virtio 0 a
+bootcmd=verified_boot_android virtio 0 a
 
 bootdelay=0
 

microdroid/uboot-env.txt

diff --git a/microdroid/uboot-env.txt b/microdroid/uboot-env.txt
index 2c5bee7..b5f3968 100644
--- a/microdroid/uboot-env.txt
+++ b/microdroid/uboot-env.txt
@@ -3,7 +3,7 @@
 # Boot the device following the Android boot procedure
 # `0` is the disk number of os_composite.img
 # `a` and `_a` are the slot index for A/B
-bootcmd=avb init virtio 0 && avb verify _a && env set bootargs "$bootargs $avb_bootargs" && boot_android virtio 0 a
+bootcmd=verified_boot_android virtio 0 a
 
 bootdelay=0
 fdtaddr=0x80000000