diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-01-22 18:06:12 -0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 10:54:51 +0100 |
| commit | cdcc3a8660fa4254d6d3ca6932a7cd599c0f1662 (patch) | |
| tree | cbdb4c9f88d7a0d27110e6f7f2fc5c7fd22cfac1 | |
| parent | 0798437c661ef3ca11f84fb45b4cce5b7ac145d9 (diff) | |
toradex: configblock: initialize MMC before switching partition
If the module is in serial downloader mode, we do no longer read the
environment from eMMC. Therefor, the eMMC is unitialized when trying
to read the config block. Use mmc_init to initialize the selected
MMC device before using it.
Note: In case the MMC has already been initialized, the mmc_init
detects that and returns immediately.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
board/toradex/common/configblock.c
(cherry picked from commit 0520b532d77d238be8015d3041a95188e47945cc)
(cherry picked from commit 3cb5f6450c39678a6361620bd45c423a503895cd)
(cherry picked from commit 79d3008acaebc0d33ba8fc21ffe46f058416d4a3)
Conflicts:
board/toradex/common/tdx-cfg-block.c
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index ad5a6ad399..76dfeae948 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -118,6 +118,10 @@ static int tdx_cfg_block_mmc_storage(u8 *config_block, int write) ret = -ENODEV; goto out; } + if (mmc_init(mmc)) { + puts("MMC init failed\n"); + return -EINVAL; + } if (part != mmc_get_blk_desc(mmc)->hwpart) { if (blk_select_hwpart_devnum(IF_TYPE_MMC, dev, part)) { puts("MMC partition switch failed\n"); |