summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-imx/mx6/soc.c2
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] */