Use devnum#partname format instead of the part number
The first and the second parameters of the `boot_android` command are
dev_iface and dev_part_str. The former selects the device interface like
`virtio` and the latter selects a specific partition. The format for the
latter is devnum#partname. ex) 0#misc. When the second parameter is not
given, u-boot falls back to read the environment variable `bootdevice`,
whose format is `devnum:partnum`.
For microdroid (and cuttlefish as well), we have been relying on the
fallback behavior. With this change, we stop doing that. The second
parameter is correctly set to "0#misc" and the variable `bootdevice`
is dropped.
Bug: 181635258
Test: microdroid boots
Change-Id: Ib572d0149765ee93d780837216e6a1c8eafaad03
diff --git a/microdroid/uboot-env.txt b/microdroid/uboot-env.txt
index cdd2c19..44b39e2 100644
--- a/microdroid/uboot-env.txt
+++ b/microdroid/uboot-env.txt
@@ -1,12 +1,10 @@
# Static u-boot environment variables for microdroid. See b/180481192
# Boot the device following the Android boot procedure
-bootcmd=boot_android virtio -
+bootcmd=boot_android virtio 0#misc
# Kernel commandlines
bootargs=rdinit=/bin/init_vendor panic=-1 androidboot.first_stage_console=1 androidboot.hardware=microdroid androidboot.boot_devices=10000.pci
-# 0:2 is the misc partition
-bootdevice=0:2
bootdelay=0
fdtaddr=0x80000000