From 11b00e62e385ed5b701fc3a9d7ac7826a63280b9 Mon Sep 17 00:00:00 2001
From: Ye Li <ye.li@nxp.com>
Date: Mon, 31 Oct 2016 10:10:17 +0800
Subject: [PATCH] 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 <ye.li@nxp.com>
(cherry picked from commit 066f001a19bdc51b0fc0d65bcb87081b01f957c2)
---
common/autoboot.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 1c08c08859..d8a126fe1b 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -250,7 +250,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");
@@ -288,7 +288,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);
--
GitLab