From b7d26e7516d817db354066074844bf1d5706df60 Mon Sep 17 00:00:00 2001 From: "faqiang.zhu" Date: Fri, 20 Nov 2020 13:07:13 +0800 Subject: [PATCH] MA-18304 pass ramdisk address when boot up evk_7ulp evk_7ulp images has normal ramdisk in boot.img and recovery ramdisk in recovery.img. Normal ramdisk in boot.img is used to boot up Android, ramdisk addr need to be passed to kernel any way. Recovery ramdisk in recovery.img is not used to boot up Android, there is no need to pass "androidboot.force_normal_boot=1". Change-Id: Id1e9c31035cbf65cd325c70a0aa9df05ea1d90b2 Signed-off-by: faqiang.zhu (cherry picked from commit 3f4d826944f7f0db9251cf26f6f65014ca3f5e8a) (cherry picked from commit 6ecfd9ed2af555f589c7cdfe32134ea1e6a41d80) --- drivers/fastboot/fb_fsl/fb_fsl_boot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/fastboot/fb_fsl/fb_fsl_boot.c b/drivers/fastboot/fb_fsl/fb_fsl_boot.c index 0e519917ee..b1df91999f 100644 --- a/drivers/fastboot/fb_fsl/fb_fsl_boot.c +++ b/drivers/fastboot/fb_fsl/fb_fsl_boot.c @@ -222,7 +222,7 @@ U_BOOT_CMD( /* Section for Android bootimage format support */ -#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION +#if !defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT) /* Setup booargs for taking the system parition as ramdisk */ static void fastboot_setup_system_boot_args(const char *slot, bool append_root) { @@ -691,7 +691,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { } if (avb_out_data->cmdline != NULL) strcat(bootargs_sec, avb_out_data->cmdline); -#ifdef CONFIG_ANDROID_DYNAMIC_PARTITION +#if defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT) /* for the condition dynamic partition is used , recovery ramdisk is used to boot * up Android, in this condition, "androidboot.force_normal_boot=1" is needed */ if(!is_recovery_mode) { @@ -699,7 +699,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { } #endif env_set("bootargs_sec", bootargs_sec); -#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION +#if !defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT) if(!is_recovery_mode) { if(avb_out_data->cmdline != NULL && strstr(avb_out_data->cmdline, "root=")) fastboot_setup_system_boot_args(avb_out_data->ab_suffix, false); @@ -881,7 +881,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { sprintf(fdt_addr_start, "0x%x", fdt_addr); /* Don't pass ramdisk addr for Android Auto if we are not booting from recovery */ -#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION +#if !defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT) if (!is_recovery_mode) boot_args[2] = NULL; #endif -- 2.17.1