diff mbox series

imx: spl: Fix build-time test for CONFIG_SPL_FS_FAT

Message ID 3874a128-0cf7-d2e1-7d08-d7a037732d07@web.de
State New
Headers show
Series imx: spl: Fix build-time test for CONFIG_SPL_FS_FAT | expand

Commit Message

Jan Kiszka April 29, 2020, 5:23 p.m. UTC
From: Jan Kiszka <jan.kiszka at siemens.com>

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

Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
---

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

 arch/arm/mach-imx/spl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
2.16.4

Comments

Harald Seiler April 30, 2020, 10:06 a.m. UTC | #1
Hello Jan,

On Wed, 2020-04-29 at 19:23 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka at siemens.com>
> 
> 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

> Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
> ---
> 
> Found by chance while working on other code. Not tested.
> 
>  arch/arm/mach-imx/spl.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
> index 49bb3b928d..bfdb3f3ada 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -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

Regards,
Jan Kiszka April 30, 2020, 10:10 a.m. UTC | #2
On 30.04.20 12:06, Harald Seiler wrote:
> Hello Jan,
>
> On Wed, 2020-04-29 at 19:23 +0200, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka at siemens.com>
>>
>> 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

> [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
>
>> Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
>> ---
>>
>> Found by chance while working on other code. Not tested.
>>
>>   arch/arm/mach-imx/spl.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
>> index 49bb3b928d..bfdb3f3ada 100644
>> --- a/arch/arm/mach-imx/spl.c
>> +++ b/arch/arm/mach-imx/spl.c
>> @@ -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
>
> Regards,
>
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 49bb3b928d..bfdb3f3ada 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -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;