pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the unused 'b' slot 

Although we can't opt-out A/B (because bootloader is built with
CONFIG_ANDROID_AB), but we can delete the unused 'b' slot as the update
of microdroid is not done by writing into the disk, but updating the
virt APEX that has the microdroid image.

Bug: N/A
Test: atest MicrodroidHostTestCases
Change-Id: Ie5871bf1b665e2cc564af54338043ae482ca01bb
This commit is contained in:
Jiyong Park 2021-06-16 18:36:18 +09:00
parent 25f1ddce8e
commit f6503cf4e3
4 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
microdroid/README.md
View File

@ -56,34 +56,18 @@ microdroid.json:
"label": "boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
{
"label": "boot_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
{
"label": "vendor_boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
},
{
"label": "vendor_boot_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
},
{
"label": "vbmeta_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta.img"
},
{
"label": "vbmeta_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta.img"
},
{
"label": "vbmeta_system_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta_system.img"
},
{
"label": "vbmeta_system_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta_system.img"
},
{
"label": "super",
"path": "/apex/com.android.virt/etc/fs/microdroid_super.img"

16
microdroid/microdroid_cdisk.json
View File

@ -4,34 +4,18 @@
"label": "boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
{
"label": "boot_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
{
"label": "vendor_boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
},
{
"label": "vendor_boot_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
},
{
"label": "vbmeta_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta.img"
},
{
"label": "vbmeta_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta.img"
},
{
"label": "vbmeta_system_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta_system.img"
},
{
"label": "vbmeta_system_b",
"path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta_system.img"
},
{
"label": "super",
"path": "/apex/com.android.virt/etc/fs/microdroid_super.img"

4
microdroid/uboot-env-x86_64.txt
View File

@ -1,7 +1,9 @@
# Static u-boot environment variables for microdroid. See b/180481192
# Boot the device following the Android boot procedure
bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0
# `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 && boot_android virtio 0 a
bootdelay=0

4
microdroid/uboot-env.txt
View File

@ -1,7 +1,9 @@
# Static u-boot environment variables for microdroid. See b/180481192
# Boot the device following the Android boot procedure
bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0
# `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 && boot_android virtio 0 a
bootdelay=0
fdtaddr=0x80000000