summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>2024-04-15 14:43:57 +0200
committerQuentin Schulz <quentin.schulz@theobroma-systems.com>2024-04-22 10:31:24 +0200
commita2caa651a82a06664365bd10efefa65a03c4d1d2 (patch)
tree262a24479b538d76351f7b3f49cfd4c0e6055993
parent14479a32538eb3ff0e9d6f4c0c9296c10b2caf1b (diff)
UPSTREAM: env: mmc: print MMC device being readHEADv2022.10-puma
This prints the MMC device being read similar to how we print the MMC device we write to when e.g. calling saveenv. One of the side effects is that the boot log now shows from which MMC device the env was loaded: Loading Environment from MMC... Reading from MMC(1)... OK This is useful to identify which MMC device the environment was loaded from for boards where there are more than one (e.g. eMMC and SD card) without adding some debug messages manually. Sadly, there's no way to know which of the default or redundant environment is being read from env_mmc_load before env_import_redund is called so it is printing a bit later (and possibly after error/warning messages). Cc: Quentin Schulz <foss+uboot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Dragan Simic <dsimic@manjaro.org> (cherry picked from commit 97b34f6ace539c9c16eb8565f8b58730848ba97a) Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
-rw-r--r--env/mmc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/env/mmc.c b/env/mmc.c
index 0c498d9a46..f1cdaf01e2 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -377,6 +377,7 @@ static int env_mmc_load(void)
ret = env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2,
read2_fail, H_EXTERNAL);
+ printf("Reading from %sMMC(%d)... ", gd->env_valid == ENV_REDUND ? "redundant " : "", dev);
fini:
fini_mmc_for_env(mmc);
@@ -418,6 +419,8 @@ static int env_mmc_load(void)
goto fini;
}
+ printf("Reading from MMC(%d)... ", dev);
+
ret = env_import(buf, 1, H_EXTERNAL);
if (!ret) {
ep = (env_t *)buf;