Skip to content
Snippets Groups Projects
Commit 26862b4a authored by Faiz Abbas's avatar Faiz Abbas Committed by Tom Rini
Browse files

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: default avatarFaiz Abbas <faiz_abbas@ti.com>
parent 7b1cfec3
No related branches found
No related tags found
No related merge requests found
...@@ -87,6 +87,9 @@ static int env_ext4_load(void) ...@@ -87,6 +87,9 @@ static int env_ext4_load(void)
int err; int err;
loff_t off; loff_t off;
if (!strcmp(CONFIG_ENV_EXT4_INTERFACE, "mmc"))
mmc_initialize(NULL);
part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE, part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE,
CONFIG_ENV_EXT4_DEVICE_AND_PART, CONFIG_ENV_EXT4_DEVICE_AND_PART,
&dev_desc, &info, 1); &dev_desc, &info, 1);
......
...@@ -89,6 +89,9 @@ static int env_fat_load(void) ...@@ -89,6 +89,9 @@ static int env_fat_load(void)
int dev, part; int dev, part;
int err; int err;
if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc"))
mmc_initialize(NULL);
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
CONFIG_ENV_FAT_DEVICE_AND_PART, CONFIG_ENV_FAT_DEVICE_AND_PART,
&dev_desc, &info, 1); &dev_desc, &info, 1);
......
...@@ -273,6 +273,8 @@ static int env_mmc_load(void) ...@@ -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_env1, 1);
ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1); ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1);
mmc_initialize(NULL);
mmc = find_mmc_device(dev); mmc = find_mmc_device(dev);
errmsg = init_mmc_for_env(mmc); errmsg = init_mmc_for_env(mmc);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment