diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-08 22:49:50 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-08 22:59:41 +0300 |
| commit | f5e73a34eddea4fb7c5e3d984b86f395996a64cd (patch) | |
| tree | 1854f2e0d2dae343f85870f2a62ae35bdd335a85 /board/compulab/cl-som-imx7/spl.c | |
| parent | e5aee22e4be75e75a854ab64503fc80598bc2004 (diff) | |
| parent | 5053da2e4aa297d888cdfc7d216d935504a9472a (diff) | |
| download | u-boot-f5e73a34eddea4fb7c5e3d984b86f395996a64cd.tar.xz | |
Merge tag 'mmc-6-23' of https://github.com/MrVan/u-boot
- Pull in the series to split fsl_esdhc for i.MX/non-i.MX cleanly
Diffstat (limited to 'board/compulab/cl-som-imx7/spl.c')
| -rw-r--r-- | board/compulab/cl-som-imx7/spl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c index 76a4c8beb0..f9a19f08da 100644 --- a/board/compulab/cl-som-imx7/spl.c +++ b/board/compulab/cl-som-imx7/spl.c @@ -9,14 +9,14 @@ #include <common.h> #include <spl.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/arch-mx7/mx7-pins.h> #include <asm/arch-mx7/clock.h> #include <asm/arch-mx7/mx7-ddr.h> #include "common.h" -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg cl_som_imx7_spl_usdhc_cfg = { USDHC1_BASE_ADDR, 0, 4}; @@ -27,7 +27,7 @@ int board_mmc_init(bd_t *bis) cl_som_imx7_spl_usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); return fsl_esdhc_initialize(bis, &cl_som_imx7_spl_usdhc_cfg); } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC_IMX */ static iomux_v3_cfg_t const led_pads[] = { MX7D_PAD_SAI1_TX_SYNC__GPIO6_IO14 | MUX_PAD_CTRL(PAD_CTL_PUS_PU5KOHM | |