diff options
| author | Frank Li <Frank.Li@nxp.com> | 2018-05-10 09:26:06 -0500 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-06-13 03:06:49 -0700 |
| commit | d39fd3f88c68b3dc10c78132aad074ccfb994b3e (patch) | |
| tree | e29e933590e6f385fc01edb10d2461638de93ce5 /common | |
| parent | 8c6c2a1e7feeb4ef5f355cdf368ab2c0e9c23a49 (diff) | |
MLK-18257-4 use another method check if need run bootcmd_mfg
Signed-off-by: Frank Li <Frank.Li@nxp.com>
(cherry picked from commit 09b1876fa4c74f8bd9b1efbf17ab8ab012a14555)
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 8 |
1 files 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); } |