Re: [PATCH v5 36/44] imx: Use SATA instead of CMD_SATA

Baruch Siach
2023-02-22T16:51:32Z

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 <sjg@chromium.org>

This conflicts with

https://patchwork.ozlabs.org/project/uboot/patch/20230222013821.1144691-19-troykiskyboundary@gmail.com/

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------------{=
- baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -