From 756f99a428177a8da5f370bd70b4c90287a2da0c Mon Sep 17 00:00:00 2001 From: Ye Li Date: Mon, 31 Oct 2016 10:10:17 +0800 Subject: MLK-13410 Android: Change to set mfgtool only for none android u-boot The mfgtool environments only can set in BSP u-boot image, not for android u-boot. Since android u-boot may go into fastboot in board_r phase which is earlier than mfgtool environment check. The USB status from android fastboot will cause u-boot to configure mfgtool environment. Signed-off-by: Ye Li (cherry picked from commit 066f001a19bdc51b0fc0d65bcb87081b01f957c2) (cherry picked from commit 03f995630f92462081e98412a0fbc86bb5106f10) --- common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/autoboot.c b/common/autoboot.c index f626c57..d204589 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -326,7 +326,7 @@ const char *bootdelay_process(void) s = getenv("bootdelay"); bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY; -#ifdef is_boot_from_usb +#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb) if (is_boot_from_usb()) { disconnect_from_pc(); printf("Boot from USB for mfgtools\n"); @@ -364,7 +364,7 @@ const char *bootdelay_process(void) #endif /* CONFIG_BOOTCOUNT_LIMIT */ s = getenv("bootcmd"); -#ifdef is_boot_from_usb +#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb) if (is_boot_from_usb()) { s = getenv("bootcmd_mfg"); printf("Run bootcmd_mfg: %s\n", s); -- cgit v1.1