From d39fd3f88c68b3dc10c78132aad074ccfb994b3e Mon Sep 17 00:00:00 2001 From: Frank Li Date: Thu, 10 May 2018 09:26:06 -0500 Subject: [PATCH] MLK-18257-4 use another method check if need run bootcmd_mfg Signed-off-by: Frank Li (cherry picked from commit 09b1876fa4c74f8bd9b1efbf17ab8ab012a14555) --- common/autoboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/autoboot.c b/common/autoboot.c index 0d826e81df..b9c59233e3 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -311,8 +311,8 @@ const char *bootdelay_process(void) s = env_get("bootdelay"); bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY; -#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb) - if (is_boot_from_usb()) { +#if defined(is_boot_from_usb) + if (is_boot_from_usb() && env_get("bootcmd_mfg")) { disconnect_from_pc(); printf("Boot from USB for mfgtools\n"); bootdelay = 0; @@ -349,8 +349,8 @@ const char *bootdelay_process(void) #endif /* CONFIG_BOOTCOUNT_LIMIT */ s = env_get("bootcmd"); -#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb) - if (is_boot_from_usb()) { +#if defined(is_boot_from_usb) + if (is_boot_from_usb() && env_get("bootcmd_mfg")) { s = env_get("bootcmd_mfg"); printf("Run bootcmd_mfg: %s\n", s); }