env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it

When booting from a non-MMC device, the MMC sub-system may not be
initialized when the environment is first accessed.
We need to make sure that the MMC sub-system is ready in even a non-MMC
boot case.

Therefore, initialize mmc before loading environment from it.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

diff --git a/env/ext4.c b/env/ext4.c
index 3f3aac57377344c76bdde3c5e358034117a7b088..6c69a0a57f44fe5ddb796f1ed00ee1890c308d92 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -87,6 +87,9 @@ static int env_ext4_load(void)
        int err;
        loff_t off;
 
+       if (!strcmp(CONFIG_ENV_EXT4_INTERFACE, "mmc"))
+               mmc_initialize(NULL);
+
        part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE,
                                       CONFIG_ENV_EXT4_DEVICE_AND_PART,
                                       &dev_desc, &info, 1);

diff --git a/env/fat.c b/env/fat.c
index e6bd1f915dc616aeaeee3016fef1c424da59baeb..19f260e881ac3e77f5d04e69aeb261691f780388 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -89,6 +89,9 @@ static int env_fat_load(void)
        int dev, part;
        int err;
 
+       if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc"))
+               mmc_initialize(NULL);
+
        part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
                                        CONFIG_ENV_FAT_DEVICE_AND_PART,
                                        &dev_desc, &info, 1);

diff --git a/env/mmc.c b/env/mmc.c
index 1058b8c512b0a4792f682068836c2cd8f7af40f9..6f11deccb1254cbcedd0f37b171b04da4731aaae 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -273,6 +273,8 @@ static int env_mmc_load(void)
        ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1);
        ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1);
 
+       mmc_initialize(NULL);
+
        mmc = find_mmc_device(dev);
 
        errmsg = init_mmc_for_env(mmc);