Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ae442f7456779b23996672695ffe98abbaaf607e

Authored by faqiang.zhu
1 parent 65fcba7f10
Exists in smarc-8m-android-10.0.0_2.6.0 and in 1 other branch 8qm-imx_v2020.04_5.4.70_2.3.0

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 <faqiang.zhu@nxp.com>

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

drivers/fastboot/fb_fsl/fb_fsl_boot.c
Diff comments   View file @ ae442f7
... ... @@ -222,7 +222,7 @@
222 222  
223 223 /* Section for Android bootimage format support */
224 224  
225   -#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION
  225 +#if !defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT)
226 226 /* Setup booargs for taking the system parition as ramdisk */
227 227 static void fastboot_setup_system_boot_args(const char *slot, bool append_root)
228 228 {
... ... @@ -695,7 +695,7 @@
695 695 }
696 696 if (avb_out_data->cmdline != NULL)
697 697 strcat(bootargs_sec, avb_out_data->cmdline);
698   -#ifdef CONFIG_ANDROID_DYNAMIC_PARTITION
  698 +#if defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT)
699 699 /* for the condition dynamic partition is used , recovery ramdisk is used to boot
700 700 * up Android, in this condition, "androidboot.force_normal_boot=1" is needed */
701 701 if(!is_recovery_mode) {
... ... @@ -703,7 +703,7 @@
703 703 }
704 704 #endif
705 705 env_set("bootargs_sec", bootargs_sec);
706   -#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION
  706 +#if !defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT)
707 707 if(!is_recovery_mode) {
708 708 if(avb_out_data->cmdline != NULL && strstr(avb_out_data->cmdline, "root="))
709 709 fastboot_setup_system_boot_args(avb_out_data->ab_suffix, false);
... ... @@ -885,7 +885,7 @@
885 885 sprintf(fdt_addr_start, "0x%x", fdt_addr);
886 886  
887 887 /* Don't pass ramdisk addr for Android Auto if we are not booting from recovery */
888   -#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION
  888 +#if !defined(CONFIG_ANDROID_DYNAMIC_PARTITION) && defined(CONFIG_SYSTEM_RAMDISK_SUPPORT)
889 889 if (!is_recovery_mode)
890 890 boot_args[2] = NULL;
891 891 #endif