Skip to contentSkip to conversation

imx_common: Return MMCSD_MODE_FS in spl_boot_mode() also for EXTFS

PATCH New Petr Kulhavy 2 participants 2 messages Jun 12, 2016 – Jun 18, 2016

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Petr Kulhavy

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
CC Stefano Babic <[email protected]>
CC Tim Harvey <[email protected]>
CC Fabio Estevam <[email protected]>
---
 arch/arm/imx-common/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/imx-common/spl.c +1 -1
index caa45cf..42cefdd 100644
@@ -76,7 +76,7 @@ u32 spl_boot_mode(void)
 	/* 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;
Signature · 1 line
2.5.0
Applied
#1 lore raw

PATCH 1/1 imx_common: Return MMCSD_MODE_FS in spl_boot_mode() also for EXTFS

Quoted 20 lines · Petr Kulhavy

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 <[email protected]>
CC Stefano Babic <[email protected]>
CC Tim Harvey <[email protected]>
CC Fabio Estevam <[email protected]>
---
 arch/arm/imx-common/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/imx-common/spl.c +0 -0
index caa45cf..42cefdd 100644

arch/arm/imx-common/spl.c u32 spl_boot_mode(void) · line 82

Quoted 8 lines
arch/arm/imx-common/spl.c +1 -1
@@ -76,7 +76,7 @@ u32 spl_boot_mode(void)
 	/* 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;

Applied to master (bug fix), thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================