summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-10-31 10:10:17 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:04:37 +0800
commit7403dd7d154e1cb64a5a852ded97988f0c760eda (patch)
treefb2786e85a691db05a33a75b9bbd0e2e2004dc61
parentd93981a97a5fda34433d9427d0130c0b9663b1b1 (diff)
downloadu-boot-imx-7403dd7d154e1cb64a5a852ded97988f0c760eda.zip
u-boot-imx-7403dd7d154e1cb64a5a852ded97988f0c760eda.tar.gz
u-boot-imx-7403dd7d154e1cb64a5a852ded97988f0c760eda.tar.bz2
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) (cherry picked from commit 03f995630f92462081e98412a0fbc86bb5106f10)
-rw-r--r--common/autoboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/autoboot.c b/common/autoboot.c
index b9a0fa9..80a4f62 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -311,7 +311,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");
@@ -349,7 +349,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);