diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-08 15:49:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-08 15:59:41 -0400 |
| commit | f5e73a34eddea4fb7c5e3d984b86f395996a64cd (patch) | |
| tree | 1854f2e0d2dae343f85870f2a62ae35bdd335a85 /board/el | |
| parent | e5aee22e4be75e75a854ab64503fc80598bc2004 (diff) | |
| parent | 5053da2e4aa297d888cdfc7d216d935504a9472a (diff) | |
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/el')
| -rw-r--r-- | board/el/el6x/el6x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c index dd0c112088..55db26a819 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -16,7 +16,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/video.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h> @@ -255,7 +255,7 @@ iomux_v3_cfg_t const usdhc4_pads[] = { MX6_PAD_SD4_DAT7__SD4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), }; -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX struct fsl_esdhc_cfg usdhc_cfg[2] = { {USDHC2_BASE_ADDR}, {USDHC4_BASE_ADDR}, |