diff options
| author | faqiang.zhu <faqiang.zhu@nxp.com> | 2020-05-08 22:29:57 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2020-05-18 09:45:08 +0800 |
| commit | cf3fba9b8215536134423600380eacfddf4d67e0 (patch) | |
| tree | 8e3e4118e99aa15670c3bd645614a522c2f2cfec /drivers | |
| parent | 41e0a3f238666d80387503453b92c87b2417e85a (diff) | |
MA-16457-3 allow automotive to access system partition info
dynamic partition feature is not enabled on automotive, so there is
system partition in GPT, uboot for automotive need to get the info of
this partition to generate the correct bootargs.
And also, there is no commandline descriptor as "dm=***" in vbmeta image
for standard Android after dynamic partition feature is enabled, so
there is no need to use "strstr" to eleminate this from the bootargs.
Change-Id: I51b3b92f5a22550602335cfc212831b263526f42
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fastboot/fb_fsl/fb_fsl_boot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/fastboot/fb_fsl/fb_fsl_boot.c b/drivers/fastboot/fb_fsl/fb_fsl_boot.c index 652145f7dd..86511ab19c 100644 --- a/drivers/fastboot/fb_fsl/fb_fsl_boot.c +++ b/drivers/fastboot/fb_fsl/fb_fsl_boot.c @@ -672,10 +672,8 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { "androidboot.verifiedbootstate=orange androidboot.flash.locked=0 androidboot.slot_suffix=%s ", avb_out_data->ab_suffix); } -#ifdef CONFIG_ANDROID_AUTO_SUPPORT strcat(bootargs_sec, avb_out_data->cmdline); -#else - strcat(bootargs_sec, strstr(avb_out_data->cmdline, "androidboot")); +#ifndef CONFIG_ANDROID_AUTO_SUPPORT /* for standard android, recovery ramdisk will be used anyway, to * boot up Android, "androidboot.force_normal_boot=1" is needed */ if(!is_recovery_mode) { |