diff mbox series

arm: imx: imx8m: soc: fix the macro name

Message ID 20250515100253.730388-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series arm: imx: imx8m: soc: fix the macro name |

Commit Message

Dario Binacchi May 15, 2025, 10:02 a.m. UTC 
From: Michael Trimarchi <michael@amarulasolutions.com>

The function arch_spl_mmc_get_uboot_raw_sector() was never compiled,
even when the option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION was
enabled. So rename the macro SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION to
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION.

Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options")
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

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

Comments

'Abel Vesa' via Amarula Linux May 15, 2025, 11:37 a.m. UTC | #1 
Hi Dario,

On 5/15/25 12:02 PM, Dario Binacchi wrote:
> From: Michael Trimarchi <michael@amarulasolutions.com>
> 
> The function arch_spl_mmc_get_uboot_raw_sector() was never compiled,
> even when the option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION was
> enabled. So rename the macro SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION to
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION.
> 
> Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options")
> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> 
> ---
> 
>   arch/arm/mach-imx/imx8m/soc.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
> index 567e8e9e81a0..806adcf145fa 100644
> --- a/arch/arm/mach-imx/imx8m/soc.c
> +++ b/arch/arm/mach-imx/imx8m/soc.c
> @@ -791,7 +791,7 @@ int boot_mode_getprisec(void)
>   #endif
>   
>   #if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP)
> -#ifdef SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
> +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION

Maybe a good opportunity to switch to

#if IS_ENABLED(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION)

?

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

I had a random idea but I'm wondering if there's a way we could check 
all symbols listed in IS_ENABLED/CONFIG_IS_ENABLED and check they 
actually exist in Kconfig somewhere? This would not have caught this one 
since we were using #ifdef but wondering if it could help with 
migrations/renaming?

Thanks!
Quentin

To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
Tom Rini May 15, 2025, 2:35 p.m. UTC | #2 
On Thu, May 15, 2025 at 01:37:44PM +0200, Quentin Schulz wrote:
> Hi Dario,
> 
> On 5/15/25 12:02 PM, Dario Binacchi wrote:
> > From: Michael Trimarchi <michael@amarulasolutions.com>
> > 
> > The function arch_spl_mmc_get_uboot_raw_sector() was never compiled,
> > even when the option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION was
> > enabled. So rename the macro SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION to
> > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION.
> > 
> > Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options")
> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> > 
> > ---
> > 
> >   arch/arm/mach-imx/imx8m/soc.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
> > index 567e8e9e81a0..806adcf145fa 100644
> > --- a/arch/arm/mach-imx/imx8m/soc.c
> > +++ b/arch/arm/mach-imx/imx8m/soc.c
> > @@ -791,7 +791,7 @@ int boot_mode_getprisec(void)
> >   #endif
> >   #if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP)
> > -#ifdef SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
> > +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
> 
> Maybe a good opportunity to switch to
> 
> #if IS_ENABLED(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION)

I honestly don't know if that's more readable, but don't strongly care.

> ?
> 
> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
> 
> I had a random idea but I'm wondering if there's a way we could check all
> symbols listed in IS_ENABLED/CONFIG_IS_ENABLED and check they actually exist
> in Kconfig somewhere? This would not have caught this one since we were
> using #ifdef but wondering if it could help with migrations/renaming?

I think that might be something tools/qconfig.py --scan-source prints
out about, but the output then requires manual investigation. I also
*think* it missed one set of cases, but I've added a checkpatch.pl
change to be louder about it.
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 567e8e9e81a0..806adcf145fa 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -791,7 +791,7 @@  int boot_mode_getprisec(void)
 #endif
 
 #if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP)
-#ifdef SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
 #define IMG_CNTN_SET1_OFFSET	GENMASK(22, 19)
 unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
 						unsigned long raw_sect)
@@ -826,7 +826,7 @@  unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
 
 	return raw_sect;
 }
-#endif /* SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION */
+#endif /* CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION */
 #endif
 
 bool is_usb_boot(void)