Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e7ced1ea8db3deae2e45dbf1bc4edca8d0efdfe7

Authored by Haoran.Wang
Committed by Ji Luo
1 parent 46d8bccb1a
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 1 other branch smarc_8mm-imx_v2020.04_5.4.24_2.1.0

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>
(cherry picked from commit 3f2c4d49fe147637e61309421e5817b3e574ed56)

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/fastboot/fb_fsl/fb_fsl_boot.c
Diff comments   View file @ e7ced1e
... ... @@ -662,11 +662,11 @@
662 662 char bootargs_sec[ANDR_BOOT_EXTRA_ARGS_SIZE];
663 663 if (lock_status == FASTBOOT_LOCK) {
664 664 snprintf(bootargs_sec, sizeof(bootargs_sec),
665   - "androidboot.verifiedbootstate=green androidboot.slot_suffix=%s %s",
  665 + "androidboot.verifiedbootstate=green androidboot.flash.locked=1 androidboot.slot_suffix=%s %s",
666 666 avb_out_data->ab_suffix, avb_out_data->cmdline);
667 667 } else {
668 668 snprintf(bootargs_sec, sizeof(bootargs_sec),
669   - "androidboot.verifiedbootstate=orange androidboot.slot_suffix=%s %s",
  669 + "androidboot.verifiedbootstate=orange androidboot.flash.locked=0 androidboot.slot_suffix=%s %s",
670 670 avb_out_data->ab_suffix, avb_out_data->cmdline);
671 671 }
672 672 env_set("bootargs_sec", bootargs_sec);