| commit | e75b165d1243e304165bb5139c3ccd295a8a4305 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 10 06:22:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 10 06:22:03 2021 +0000 |
| tree | d33f3c28e685563539dd45f77a9699a3594796f7 | |
| parent | 11915f9a3cc14a5cf98996eed6479646de171452 [diff] | |
| parent | 7c5da87735c57f62653f7792bc76c7d318f4f596 [diff] |
Merge "Use the new verified_boot_android command" am: 7c5da87735 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1818179 Change-Id: Iaad8fbceb2babb710a7d8b859679acaa58ad2e61
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
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