colibri_imx6: fix broken fsl_esdhc_imx conversion
PATCH 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion
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 <[email protected]>
--- board/toradex/colibri_imx6/colibri_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +2 -2
@@ -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},
Signature · 1 line
2.23.0
PATCH 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion
Quoted 22 lines · Ricardo Salveti
Commit e37ac71 converted
FSL_ESDHCtoFSL_ESDHC_IMX, but the config check forcolibri_imx6wasn't updated accordantly.Signed-off-by Ricardo Salveti <[email protected]>--- board/toradex/colibri_imx6/colibri_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)board/toradex/colibri_imx6/colibri_imx6.c +1
-1@@ -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),
board/toradex/colibri_imx6/colibri_imx6.c int board_ehci_hcd_init(int port) · line 310
Quoted 8 lines
board/toradex/colibri_imx6/colibri_imx6.c +1
-1@@ -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 <[email protected]>
Thanks!
Max