diff options
| author | Luo Ji <ji.luo@nxp.com> | 2018-02-12 14:41:37 +0800 |
|---|---|---|
| committer | zhang sanshan <sanshan.zhang@nxp.com> | 2018-02-23 14:01:29 +0800 |
| commit | de18b5fbb2e34c79437013926744156371f97dec (patch) | |
| tree | 9ce353082ae53f8ef459767d0a1e6cfb36f7a15f | |
| parent | d04675743a28c81e7bfb3e8266e0f7c7a173260e (diff) | |
| download | uboot-imx-de18b5fbb2e34c79437013926744156371f97dec.tar.gz | |
MA-10947 Enable DM-Verify feature for A/B Slot
Pass the dm-verity commandline in vbmeta to enable the dm-verity
feature.
Change-Id: I1533870708535e2efda5015743df1f807cf5e986
Signed-off-by: Luo Ji <ji.luo@nxp.com>
| -rwxr-xr-x | drivers/usb/gadget/f_fastboot.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index f0a1af7de1..e8a8f84457 100755 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1578,17 +1578,15 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { printf(" boot '%s%s' still\n", avb_loadpart->partition_name, avb_out_data->ab_suffix); } - /* The dm-verity commandline has conflicts with system bootargs and we can't - * determine whether dm-verity is opened by the commandline for now. */ char bootargs_sec[ANDR_BOOT_ARGS_SIZE]; if (lock_status == FASTBOOT_LOCK) { sprintf(bootargs_sec, - "androidboot.verifiedbootstate=green androidboot.slot_suffix=%s", - avb_out_data->ab_suffix); + "androidboot.verifiedbootstate=green androidboot.slot_suffix=%s %s", + avb_out_data->ab_suffix, avb_out_data->cmdline); } else { sprintf(bootargs_sec, - "androidboot.verifiedbootstate=orange androidboot.slot_suffix=%s", - avb_out_data->ab_suffix); + "androidboot.verifiedbootstate=orange androidboot.slot_suffix=%s %s", + avb_out_data->ab_suffix, avb_out_data->cmdline); } setenv("bootargs_sec", bootargs_sec); #ifdef CONFIG_SYSTEM_RAMDISK_SUPPORT |