mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-23 14:51:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

env_mmc: add error message to pass to set_default_env

Browse Source 
Add an error message that gets passed to set_default_env() like
env_nand implements. This message is displayed to the user as the
reason for falling back to the default environment.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2015-05-08 14:52:09 -07:00 committed by Tom Rini
parent f19f389f34
commit c75648d75e
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/env_mmc.c
View File

@ -90,19 +90,18 @@ static int mmc_set_env_part(struct mmc *mmc)
static inline int mmc_set_env_part(struct mmc *mmc) {return 0; }; static inline int mmc_set_env_part(struct mmc *mmc) {return 0; };
#endif #endif
static int init_mmc_for_env(struct mmc *mmc) static const char *init_mmc_for_env(struct mmc *mmc)
{ {
if (!mmc) { if (!mmc)
puts("No MMC card found\n"); return "No MMC card found";
return -1;
}
if (mmc_init(mmc)) { if (mmc_init(mmc))
puts("MMC init failed\n"); return "MMC init failed";
return -1;
}
return mmc_set_env_part(mmc); if (mmc_set_env_part(mmc))
return "MMC partition switch failed";
return NULL;
} }
static void fini_mmc_for_env(struct mmc *mmc) static void fini_mmc_for_env(struct mmc *mmc)
@ -143,9 +142,13 @@ int saveenv(void)
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
u32 offset; u32 offset;
int ret, copy = 0; int ret, copy = 0;
const char *errmsg;
if (init_mmc_for_env(mmc)) errmsg = init_mmc_for_env(mmc);
if (errmsg) {
printf("%s\n", errmsg);
return 1; return 1;
}
ret = env_export(env_new); ret = env_export(env_new);
if (ret) if (ret)
@ -213,6 +216,7 @@ void env_relocate_spec(void)
env_t *ep; env_t *ep;
int ret; int ret;
int dev = CONFIG_SYS_MMC_ENV_DEV; int dev = CONFIG_SYS_MMC_ENV_DEV;
const char *errmsg = NULL;
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);
@ -223,7 +227,8 @@ void env_relocate_spec(void)
mmc = find_mmc_device(dev); mmc = find_mmc_device(dev);
if (init_mmc_for_env(mmc)) { errmsg = init_mmc_for_env(mmc);
if (errmsg) {
ret = 1; ret = 1;
goto err; goto err;
} }
@ -249,6 +254,7 @@ void env_relocate_spec(void)
(crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc); (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
if (!crc1_ok && !crc2_ok) { if (!crc1_ok && !crc2_ok) {
errmsg = "!bad CRC";
ret = 1; ret = 1;
goto fini; goto fini;
} else if (crc1_ok && !crc2_ok) { } else if (crc1_ok && !crc2_ok) {
@ -284,8 +290,7 @@ fini:
fini_mmc_for_env(mmc); fini_mmc_for_env(mmc);
err: err:
if (ret) if (ret)
set_default_env(NULL); set_default_env(errmsg);
#endif #endif
} }
#else /* ! CONFIG_ENV_OFFSET_REDUND */ #else /* ! CONFIG_ENV_OFFSET_REDUND */
@ -297,6 +302,7 @@ void env_relocate_spec(void)
u32 offset; u32 offset;
int ret; int ret;
int dev = CONFIG_SYS_MMC_ENV_DEV; int dev = CONFIG_SYS_MMC_ENV_DEV;
const char *errmsg;
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
dev = 0; dev = 0;
@ -304,7 +310,8 @@ void env_relocate_spec(void)
mmc = find_mmc_device(dev); mmc = find_mmc_device(dev);
if (init_mmc_for_env(mmc)) { errmsg = init_mmc_for_env(mmc);
if (errmsg) {
ret = 1; ret = 1;
goto err; goto err;
} }
@ -315,6 +322,7 @@ void env_relocate_spec(void)
} }
if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) { if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) {
errmsg = "!read failed";
ret = 1; ret = 1;
goto fini; goto fini;
} }
@ -326,7 +334,7 @@ fini:
fini_mmc_for_env(mmc); fini_mmc_for_env(mmc);
err: err:
if (ret) if (ret)
set_default_env(NULL); set_default_env(errmsg);
#endif #endif
} }
#endif /* CONFIG_ENV_OFFSET_REDUND */ #endif /* CONFIG_ENV_OFFSET_REDUND */