diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-05-17 19:43:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-17 19:43:10 +0000 |
| commit | 277fea5968bb5757f004610d91265320830511a3 (patch) | |
| tree | 91a420f020b47348d65ebe1f0e1a253453813bd4 | |
| parent | 0ea7669713c16f8b606cb98ab302879b660258d3 (diff) | |
| parent | 96bdfc8a4c3bd0195b764b23609f746f14f4c665 (diff) | |
Merge "Updates for Kiwi bootloaders"
| -rw-r--r-- | kiwi.fragment | 1 | ||||
| -rw-r--r-- | kiwi_env.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kiwi.fragment b/kiwi.fragment index 6bdcf6809d3..a330a643a78 100644 --- a/kiwi.fragment +++ b/kiwi.fragment @@ -2,3 +2,4 @@ # CONFIG_APIC_ALLOWS_XCHG is not set CONFIG_AVB_IS_UNLOCKED=y CONFIG_DEFAULT_ENV_FILE="kiwi_env.txt" +# CONFIG_ANDROID_BOOTLOADER_KEYMINT_CONSOLE is not set diff --git a/kiwi_env.txt b/kiwi_env.txt index 3ced2a6c539..efc2ae0f847 100644 --- a/kiwi_env.txt +++ b/kiwi_env.txt @@ -1,3 +1,3 @@ -bootcmd=virtio scan && setenv bootargs "$cbootargs $bootargs" && verified_boot_android virtio 0 a +bootcmd=virtio scan && setenv bootargs "$cbootargs $bootargs" && verified_boot_android virtio 0 _a bootdelay=0 |