summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-28 07:32:44 -0500
committerTom Rini <trini@konsulko.com>2019-11-28 07:32:44 -0500
commit4b39568cfd5c3556dda125c99f6e2777692d2034 (patch)
tree10db9e112966a64955d26eb48a4a96ae47c2b5bf /board
parent4b19b89ca4a866b7baa642533e6dbd67cd832d27 (diff)
parent3fca56ee429f1188a44113ec35d426a85068a9d2 (diff)
downloadu-boot-4b39568cfd5c3556dda125c99f6e2777692d2034.tar.gz
u-boot-4b39568cfd5c3556dda125c99f6e2777692d2034.tar.xz
u-boot-4b39568cfd5c3556dda125c99f6e2777692d2034.zip
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
- powerpc: Fix DM_MMC related build warnings by adding eSDHC device module support for T4240RDB, T2080RDB, T1042D4RDB, T1024RDB, P5040DS, P4080DS, P3041DS, P2041RDB, P2020RDB, P1020RDB platforms
Diffstat (limited to 'board')
-rw-r--r--board/freescale/common/sdhc_boot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c
index 357aba9122..a1c7a94a90 100644
--- a/board/freescale/common/sdhc_boot.c
+++ b/board/freescale/common/sdhc_boot.c
@@ -28,7 +28,11 @@ int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
return 1;
/* read out the first block, get the config data information */
+#ifdef CONFIG_BLK
+ n = blk_dread(mmc_get_blk_desc(mmc), 0, 1, tmp_buf);
+#else
n = mmc->block_dev.block_read(&mmc->block_dev, 0, 1, tmp_buf);
+#endif
if (!n) {
free(tmp_buf);
return 1;