diff options
| author | Ye Li <ye.li@nxp.com> | 2018-10-10 01:25:18 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-10-10 02:00:57 -0700 |
| commit | ceeefcaf55120c371891ea37cc3db28d8391386f (patch) | |
| tree | 01d3808ececd9fa91b19a9e42ab53aec1ba8f689 /arch/arm/mach-imx/mx6/soc.c | |
| parent | a3457bfd99930007644fbd6f1ad89764ce836e5d (diff) | |
MLK-19869-2 imx6: fix mmc_get_boot_dev issue when booting from USB
The mmc_get_boot_dev reads from SRC SBMR register. When booting with USB
serial download, this function does not return correctly. Because SBMR won't
reflect the USB boot.
The patch adds USB boot checking to this function to fix the issue.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 0d2071347211095a89dbb9c7e7d960cb8187c677)
Diffstat (limited to 'arch/arm/mach-imx/mx6/soc.c')
| -rw-r--r-- | arch/arm/mach-imx/mx6/soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index 0cdd27c301..f916f58470 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -690,7 +690,7 @@ static int mmc_get_boot_dev(void) bootsel = (soc_sbmr & 0x000000FF) >> 6; /* No boot from sd/mmc */ - if (bootsel != 1) + if (is_usb_boot() || bootsel != 1) return -1; /* BOOT_CFG2[3] and BOOT_CFG2[4] */ |