Hi, On Wed, 22 Feb 2023 at 09:45, Baruch Siach <bar...@tkos.co.il> wrote: > > Hi Simon, > > On Wed, Feb 22 2023, Simon Glass wrote: > > This causes a build failure on mx6cuboxi with split config, since CMD_SATA > > shows up as enabled in SPl (because there is no SPL_CMD_SATA). > > > > The condition is wrong anyway, so change it to use SATA instead. > > > > Signed-off-by: Simon Glass <s...@chromium.org> > > This conflicts with > > > https://patchwork.ozlabs.org/project/uboot/patch/20230222013821.1144691-19-troykiskybound...@gmail.com/
Thanks...they are similar, just that my one is getting rid of the CONFIG_IS_ENABLED() too. I think it might be best to bring in Troy's series to -next ASAP and then I can adjust the one I just sent accordingly. I have not looked in detail, but it seems like a good step along the way. Regards, Simon > > baruch > > > --- > > > > (no changes since v1) > > > > board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c > > b/board/solidrun/mx6cuboxi/mx6cuboxi.c > > index 7c44379ec4a..cb14c2f30c9 100644 > > --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c > > +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c > > @@ -275,7 +275,7 @@ int board_early_init_f(void) > > { > > setup_iomux_uart(); > > > > -#ifdef CONFIG_CMD_SATA > > +#ifdef CONFIG_SATA > > setup_sata(); > > #endif > > setup_fec(); > > > -- > ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - bar...@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -