summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHaoran.Wang <elven.wang@nxp.com>2019-06-06 12:51:06 +0800
committerdandan.sun <dandan.sun@nxp.com>2019-07-08 12:37:16 +0800
commit394d22988c975c06eb7f9e0601635c4fd6815bbd (patch)
treedc566a0478ce116205aab356919993c068f7fcbb /drivers
parent232547ff6381551e059df0b7d38d65b0307d0245 (diff)
MA-14948 Append lock status by Android Property
Follow Bootloader requirement spec in https://source.android.com/devices/bootloader/unlock-trusty. Need to pass the flash lock status by androidboot.flash.locked. This patch fixed the GTS failure com.google.android.gts.persistentdata.PersistentDataHostTest#testTestGetFlashLockState. Change-Id: I9a3508f7546b02c998e7668df2a33f864a58db75 Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/f_fastboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 14f23d6ea8..6ec6ebae26 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -2351,11 +2351,11 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
char bootargs_sec[ANDR_BOOT_EXTRA_ARGS_SIZE];
if (lock_status == FASTBOOT_LOCK) {
snprintf(bootargs_sec, sizeof(bootargs_sec),
- "androidboot.verifiedbootstate=green androidboot.slot_suffix=%s %s",
+ "androidboot.verifiedbootstate=green androidboot.flash.locked=1 androidboot.slot_suffix=%s %s",
avb_out_data->ab_suffix, avb_out_data->cmdline);
} else {
snprintf(bootargs_sec, sizeof(bootargs_sec),
- "androidboot.verifiedbootstate=orange androidboot.slot_suffix=%s %s",
+ "androidboot.verifiedbootstate=orange androidboot.flash.locked=0 androidboot.slot_suffix=%s %s",
avb_out_data->ab_suffix, avb_out_data->cmdline);
}
env_set("bootargs_sec", bootargs_sec);