diff options
| author | Ye Li <ye.li@nxp.com> | 2018-06-05 01:34:41 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-06-13 03:06:25 -0700 |
| commit | 2c840c82b3558267650b98735790ac7151644ae1 (patch) | |
| tree | b62bd46f634e8a76ec122085113a92a967db6288 /common/autoboot.c | |
| parent | 4ec81a0b075d8d853ac696172660a7771064405d (diff) | |
MLK-18591-3 android: Add FSL android fastboot support
Porting the FSL android fastboot features from imx u-boot v2017.03 to
support all SoCs: imx6/imx7/imx7ulp/imx8/imx8m
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'common/autoboot.c')
| -rw-r--r-- | common/autoboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 1b52e44939..0d826e81df 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -311,7 +311,7 @@ const char *bootdelay_process(void) s = env_get("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 = env_get("bootcmd"); -#ifdef is_boot_from_usb +#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb) if (is_boot_from_usb()) { s = env_get("bootcmd_mfg"); printf("Run bootcmd_mfg: %s\n", s); |