MA-16457-4 fix issue of evk_7ulp using boot-debug.img

evk_7ulp has recovery partition, the ramdisk in boot.img and
boot-debug.img is normal boot ramdisk not recovery ramdisk, in this
condition, there is no need to pass the bootargs to indicate it's to
boot up to Android or recovery.

Change-Id: Ic3e04aaf361b78e36c95d19f87dc266bf9b6c7d6
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
(cherry picked from commit 6e0dec768a2d16a6ff2de31fbd319d045ac83c48)
(cherry picked from commit 59abb5e52b70df34d415031d4b89606c7543b999)

diff --git a/drivers/fastboot/fb_fsl/fb_fsl_boot.c b/drivers/fastboot/fb_fsl/fb_fsl_boot.c
index 5133757..b3fab73 100644 (file)
--- a/drivers/fastboot/fb_fsl/fb_fsl_boot.c
+++ b/drivers/fastboot/fb_fsl/fb_fsl_boot.c
@@ -695,7 +695,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);
-#ifndef CONFIG_ANDROID_AUTO_SUPPORT
+#if defined(CONFIG_ANDROID_AB_SUPPORT) && !defined(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) {