Skip to contentSkip to conversation

imx: spl: Fix build-time test for CONFIG_SPL_FS_FAT

PATCH New Jan Kiszka 2 participants 3 messages Apr 29, 2020 – Apr 30, 2020

Subsystems (3)
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 imx: spl: Fix build-time test for CONFIG_SPL_FS_FAT

From: Jan Kiszka <[email protected]>

This was already changed in 0c3a9ed409a5 but apparently missed when adding 9d86dbd9cf9d.

---

Found by chance while working on other code. Not tested.

 arch/arm/mach-imx/spl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-imx/spl.c +2 -2
index 49bb3b928d..bfdb3f3ada 100644
@@ -197,7 +197,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
 	case SD1_BOOT:
 	case SD2_BOOT:
 	case SD3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT)
 		return MMCSD_MODE_FS;
 #else
 		return MMCSD_MODE_RAW;
@@ -206,7 +206,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
 	case MMC1_BOOT:
 	case MMC2_BOOT:
 	case MMC3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT)
 		return MMCSD_MODE_FS;
 #elif defined(CONFIG_SUPPORT_EMMC_BOOT)
 		return MMCSD_MODE_EMMCBOOT;

--
2.16.4

#1 lore raw

PATCH 1/1 imx: spl: Fix build-time test for CONFIG_SPL_FS_FAT

Hello Jan,

Quoted 4 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

This was already changed in 0c3a9ed409a5 but apparently missed when adding 9d86dbd9cf9d.

I sent a very similar patch [1] as part of my "Fix spl_mmc_boot_mode() implementation for IMX" series [2] which tries to solve a few more issues in this particular function.

[1]: http://patchwork.ozlabs.org/project/uboot/patch/20200423110753.51231-6-hws at denx.de/ [2]: http://patchwork.ozlabs.org/project/uboot/list/?series=172241

Quoted 31 lines

---

Found by chance while working on other code. Not tested.

 arch/arm/mach-imx/spl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-imx/spl.c +2 -3
index 49bb3b928d..bfdb3f3ada 100644
@@ -197,7 +197,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
 	case SD1_BOOT:
 	case SD2_BOOT:
 	case SD3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT)
 		return MMCSD_MODE_FS;
 #else
 		return MMCSD_MODE_RAW;
@@ -206,7 +206,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
 	case MMC1_BOOT:
 	case MMC2_BOOT:
 	case MMC3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT)
 		return MMCSD_MODE_FS;
 #elif defined(CONFIG_SUPPORT_EMMC_BOOT)
 		return MMCSD_MODE_EMMCBOOT;
--
Quoted 1 line

2.16.4

Regards,

Signature · 1 line
Harald
author
#2 lore raw

PATCH 1/1 imx: spl: Fix build-time test for CONFIG_SPL_FS_FAT

Quoted 12 lines · Harald Seiler

Hello Jan,

Quoted 4 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

This was already changed in 0c3a9ed409a5 but apparently missed when adding 9d86dbd9cf9d.

I sent a very similar patch [1] as part of my "Fix spl_mmc_boot_mode() implementation for IMX" series [2] which tries to solve a few more issues in this particular function.

Oh, didn't check - then please ignore mine.

Jan

Quoted 38 lines

[1]: http://patchwork.ozlabs.org/project/uboot/patch/20200423110753.51231-6-hws at denx.de/ [2]: http://patchwork.ozlabs.org/project/uboot/list/?series=172241

Quoted 31 lines

---

Found by chance while working on other code. Not tested.

  arch/arm/mach-imx/spl.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-imx/spl.c +2 -3
index 49bb3b928d..bfdb3f3ada 100644
@@ -197,7 +197,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
  	case SD1_BOOT:
  	case SD2_BOOT:
  	case SD3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT)
  		return MMCSD_MODE_FS;
  #else
  		return MMCSD_MODE_RAW;
@@ -206,7 +206,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
  	case MMC1_BOOT:
  	case MMC2_BOOT:
  	case MMC3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT)
  		return MMCSD_MODE_FS;
  #elif defined(CONFIG_SUPPORT_EMMC_BOOT)
  		return MMCSD_MODE_EMMCBOOT;
--
Quoted 1 line

2.16.4

Regards,