From 8e339df8ebe9910c314942b6f720e9d1f68b5de8 Mon Sep 17 00:00:00 2001 From: Luo Ji Date: Mon, 12 Feb 2018 14:41:37 +0800 Subject: [PATCH] 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 --- drivers/usb/gadget/f_fastboot.c | 10 ++++------ 1 file 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 -- 2.17.1