[U-Boot] [PATCH] colibri_imx6: fix broken fsl_esdhc_imx conversion

Max Krummenacher max.krummenacher at toradex.com
Tue Sep 3 15:17:58 UTC 2019


On Tue, 2019-09-03 at 11:53 -0300, Ricardo Salveti wrote:
> Commit e37ac71 converted FSL_ESDHC to FSL_ESDHC_IMX, but the config
> check for colibri_imx6 wasn't updated accordantly.
> 
> Signed-off-by: Ricardo Salveti <ricardo at foundries.io>
> ---
>  board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
> index ad40b589c1..44173dde1f 100644
> --- a/board/toradex/colibri_imx6/colibri_imx6.c
> +++ b/board/toradex/colibri_imx6/colibri_imx6.c
> @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = {
>  	MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
>  };
>  
> -#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
> +#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
>  /* Colibri MMC */
>  iomux_v3_cfg_t const usdhc1_pads[] = {
>  	MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> @@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
>  }
>  #endif
>  
> -#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
> +#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
>  /* use the following sequence: eMMC, MMC */
>  struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
>  	{USDHC3_BASE_ADDR},

Acked-by: Max Krummenacher <max.krummenacher at toradex.com>

Thanks!
Max


More information about the U-Boot mailing list