Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 01b73fe63078e5bb1d375dc7d66e6f67893d3305

Authored by Simon Glass
Committed by Jaehoon Chung
1 parent 9f103b9cb5
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

dm: mmc: Ensure that block device is probed 

Make sure that we probe the block device before using it when reading
the environment.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

... ... @@ -121,7 +121,12 @@
121 121 if (!mmc)
122 122 return "!No MMC card found";
123 123  
124   -#ifndef CONFIG_BLK
  124 +#ifdef CONFIG_BLK
  125 + struct udevice *dev;
  126 +
  127 + if (blk_get_from_parent(mmc->dev, &dev))
  128 + return "!No block device";
  129 +#else
125 130 if (mmc_init(mmc))
126 131 return "!MMC init failed";
127 132 #endif