diff mbox series

SPL: stm32mp1: fix spl_mmc_boot_partition not defined

Message ID 20201012141109.29778-1-richard.genoud@posteo.net
State Accepted
Delegated to: Patrick Delaunay
Headers show
Series SPL: stm32mp1: fix spl_mmc_boot_partition not defined | expand

Commit Message

Richard Genoud Oct. 12, 2020, 2:11 p.m. UTC
spl_mmc_boot_partition is only defined when
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is defined.

Signed-off-by: Richard Genoud <richard.genoud@posteo.net>
---
 arch/arm/mach-stm32mp/spl.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Patrick DELAUNAY Oct. 13, 2020, 12:18 p.m. UTC | #1
Hi Richard,

> From: Richard Genoud <richard.genoud@posteo.net>
> Sent: lundi 12 octobre 2020 16:11
> 
> spl_mmc_boot_partition is only defined when
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is defined.
> 
> Signed-off-by: Richard Genoud <richard.genoud@posteo.net>
> ---
>  arch/arm/mach-stm32mp/spl.c | 2 ++
>  1 file changed, 2 insertions(+)
> 

Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>

Thanks for this missing check in spl.

NB: after check, it is possible to IS_ENABLED to prevent #ifdef here 

<unknown>:0: warning: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible

Patrick
Richard Genoud Oct. 13, 2020, 12:25 p.m. UTC | #2
Hi Patrick,

Le 13/10/2020 à 14:18, Patrick DELAUNAY a écrit :
> Hi Richard,
> 
>> From: Richard Genoud <richard.genoud@posteo.net>
>> Sent: lundi 12 octobre 2020 16:11
>>
>> spl_mmc_boot_partition is only defined when
>> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is defined.
>>
>> Signed-off-by: Richard Genoud <richard.genoud@posteo.net>
>> ---
>>   arch/arm/mach-stm32mp/spl.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
> 
> Thanks for this missing check in spl.
> 
> NB: after check, it is possible to IS_ENABLED to prevent #ifdef here
> 
> <unknown>:0: warning: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible

I don't think it's possible to use "if (IS_ENABLED(CONFIG...))"
since we have to remove the whole function, not just some code in it.

Regards,
Richard
Patrick DELAUNAY Oct. 13, 2020, 4:42 p.m. UTC | #3
Hi,

> From: Richard Genoud <richard.genoud@posteo.net>
> Sent: mardi 13 octobre 2020 14:25
> 
> Hi Patrick,
> 
> Le 13/10/2020 à 14:18, Patrick DELAUNAY a écrit :
> > Hi Richard,
> >
> >> From: Richard Genoud <richard.genoud@posteo.net>
> >> Sent: lundi 12 octobre 2020 16:11
> >>
> >> spl_mmc_boot_partition is only defined when
> >> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is defined.
> >>
> >> Signed-off-by: Richard Genoud <richard.genoud@posteo.net>
> >> ---
> >>   arch/arm/mach-stm32mp/spl.c | 2 ++
> >>   1 file changed, 2 insertions(+)
> >>
> >
> > Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
> >
> > Thanks for this missing check in spl.
> >
> > NB: after check, it is possible to IS_ENABLED to prevent #ifdef here
> >
> > <unknown>:0: warning: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if
> > or #ifdef' where possible
> 
> I don't think it's possible to use "if (IS_ENABLED(CONFIG...))"
> since we have to remove the whole function, not just some code in it.

Normally the unused function is remove by linker without compilation flag...

But after check on my side it is not possible to use IS_ENABLED(CONFIG_ here...  
because when the flags is absent, the 2 used CONFIG_ are also absent:
- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_MMC2

And that cause compilation issue

Sorry for first feedback, I will take the patch in my next pull request.

 
> Regards,
> Richard

Regards
Patrick
Patrick DELAUNAY Nov. 25, 2020, 9:56 a.m. UTC | #4
Hi Richard,

> From: Richard Genoud <richard.genoud@posteo.net>
> Sent: lundi 12 octobre 2020 16:11
> 
> spl_mmc_boot_partition is only defined when
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is defined.
> 
> Signed-off-by: Richard Genoud <richard.genoud@posteo.net>
> ---
>  arch/arm/mach-stm32mp/spl.c | 2 ++
>  1 file changed, 2 insertions(+)
> 

Applied to u-boot-stm/master, thanks!

Regards

Patrick
diff mbox series

Patch

diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index e84bdad7bfc..32a4a69282a 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -55,6 +55,7 @@  u32 spl_mmc_boot_mode(const u32 boot_device)
 	return MMCSD_MODE_RAW;
 }
 
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
 int spl_mmc_boot_partition(const u32 boot_device)
 {
 	switch (boot_device) {
@@ -66,6 +67,7 @@  int spl_mmc_boot_partition(const u32 boot_device)
 		return -EINVAL;
 	}
 }
+#endif
 
 #ifdef CONFIG_SPL_DISPLAY_PRINT
 void spl_display_print(void)