diff options
| author | Ye Li <ye.li@nxp.com> | 2019-05-17 02:41:03 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2022-04-06 15:58:48 +0800 |
| commit | c7c98c7aa1e91996f71464f222c13f404c8408d8 (patch) | |
| tree | 915792192dbd1442683e83572c629c55d092612e /arch/arm/mach-imx/mx6 | |
| parent | 22c04fe377fdf4914721638b60554565cfaccb4c (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 f49acb763ec7165d634a119626620c596d74e419)
(cherry picked from commit f6706d17af5ce154e325b7f221ec3d74dfca2c56)
(cherry picked from commit 15b1d44fd2c56e201eeb8276b6359e6c21517ad0)
(cherry picked from commit e653b2085f77f3e2bbe91fd7aea8387c1f5f41b3)
Diffstat (limited to 'arch/arm/mach-imx/mx6')
| -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 005c1fdcaa..503174b0f6 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -702,7 +702,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] */ |