summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPetr Kulhavy <brain@jikos.cz>2016-06-12 13:18:32 +0200
committerStefano Babic <sbabic@denx.de>2016-07-12 17:58:47 +0200
commitc1ebf54868359005c32944c1473668d5fcaca158 (patch)
tree8ee5bd56bdb5efb9c5a1f59040799922887613e1 /arch
parent19ce924ff914f315dc2fdf79f357825c513aed6e (diff)
downloadu-boot-imx-c1ebf54868359005c32944c1473668d5fcaca158.zip
u-boot-imx-c1ebf54868359005c32944c1473668d5fcaca158.tar.gz
u-boot-imx-c1ebf54868359005c32944c1473668d5fcaca158.tar.bz2
imx_common: Return MMCSD_MODE_FS in spl_boot_mode() also for EXTFS
spl_boot_mode() returned MMCSD_MODE_RAW on MMC if CONFIG_SPL_EXT_SUPPORT was configured. EXTFS is the default filesystem selected in imx6_spl.h and the function should return MMCSD_MODE_FS instead. Fix this and return MMCSD_MODE_FS instead in such cases. Signed-off-by: Petr Kulhavy <brain@jikos.cz> CC: Stefano Babic <sbabic@denx.de> CC: Tim Harvey <tharvey@gateworks.com> CC: Fabio Estevam <Fabio.Estevam@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/imx-common/spl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
index bdcda7d..0c1e401 100644
--- a/arch/arm/imx-common/spl.c
+++ b/arch/arm/imx-common/spl.c
@@ -76,7 +76,7 @@ u32 spl_boot_mode(const u32 boot_device)
/* for MMC return either RAW or FAT mode */
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
return MMCSD_MODE_FS;
#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
return MMCSD_MODE_EMMCBOOT;