From 97b34f6ace539c9c16eb8565f8b58730848ba97a Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Mon, 15 Apr 2024 14:43:57 +0200 Subject: [PATCH] env: mmc: print MMC device being read 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 Signed-off-by: Quentin Schulz Reviewed-by: Tom Rini Reviewed-by: Dragan Simic --- env/mmc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/env/mmc.c b/env/mmc.c index da84cddd74..7afb733e89 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -436,6 +436,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); @@ -475,6 +476,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; -- 2.39.5