LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env_mmc: Properly prefix mmc errors with '!' 

The set_default_env() function from env_common.c expects either
a fully formatted error msg, e.g.: "## Resetting to default environment\n"
or an error msg prefixed with an !, in which case it will format it.

Fix the init_mmc_for_env() error messages to be prefixed with a !
this changes the bootup-log on sunxi when no mmc card is found from:

MMC:   SUNXI SD/MMC: 0
No MMC card foundIn:    serial
Out:   serial

To:

MMC:   SUNXI SD/MMC: 0
*** Warning - No MMC card found, using default environment

In:    serial
Out:   serial

Which clearly is how things should look.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2015-08-15 20:05:01 +02:00 committed by Tom Rini
parent 972ea53390
commit a85da21f75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/env_mmc.c
View File

@ -93,13 +93,13 @@ static inline int mmc_set_env_part(struct mmc *mmc) {return 0; };
static const char *init_mmc_for_env(struct mmc *mmc) static const char *init_mmc_for_env(struct mmc *mmc)
{ {
if (!mmc) if (!mmc)
return "No MMC card found"; return "!No MMC card found";
if (mmc_init(mmc)) if (mmc_init(mmc))
return "MMC init failed"; return "!MMC init failed";
if (mmc_set_env_part(mmc)) if (mmc_set_env_part(mmc))
return "MMC partition switch failed"; return "!MMC partition switch failed";
return NULL; return NULL;
} }