Re: [PATCH v1 19/24] arm: mach-imx: use CONFIG_$(SPL_)SATA instead of CONFIG_SATA

Troy Kisky
2023-02-23T19:24:10Z

On Wed, Feb 22, 2023 at 7:05 AM Tom Rini <trini@konsulko.com> wrote:

> On Tue, Feb 21, 2023 at 05:38:16PM -0800, Troy Kisky wrote:
>
> > This avoid an error with enable_sata_clock when
> > defined(CONFIG_SATA) is changed to CONFIG_IS_ENABLED(SATA).
> >
> > Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com>
> > ---
> >
> > arch/arm/mach-imx/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> > index 4dfc60eedc4..50f26975eac 100644
> > --- a/arch/arm/mach-imx/Makefile
> > +++ b/arch/arm/mach-imx/Makefile
> > @@ -54,7 +54,7 @@ obj-$(CONFIG_IMX_RDC) += rdc-sema.o
> > ifneq ($(CONFIG_SPL_BUILD),y)
> > obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
> > endif
> > -obj-$(CONFIG_SATA) += sata.o
> > +obj-$(CONFIG_$(SPL_)SATA) += sata.o
> > obj-$(CONFIG_IMX_HAB) += hab.o
> > obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o
> > endif
>
> In that Simon thinks the $(SPL_) syntax here is ugly, lets just move
> this line in to the existing guard for non-SPL builds, with
> imx_bootaux.o.
>
> --
> Tom
>

Hi Tom

I don't think that does the same thing for mach-mvebu.

arch/arm/mach-mvebu/Kconfig-config MVEBU_SPL_BOOT_DEVICE_SATA
arch/arm/mach-mvebu/Kconfig- bool "SATA"
arch/arm/mach-mvebu/Kconfig: imply SPL_SATA

Shouldn't it be linked in SPL builds as well for that one?

BR
Troy