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

env: common: Factor out the common env_valid check

Browse Source 
The check for gd->env_valid is used in both the 'if' and 'else' part of
env_get_char(). Move it into that function instead for simplicity. Drop
that code from the two leaf functions.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2017-08-03 12:21:53 -06:00 committed by Tom Rini
parent 0219fb61c1
commit 5fc5254084
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
env/common.c vendored
View File

@ -34,25 +34,20 @@ __weak uchar env_get_char_spec(int index)
static uchar env_get_char_init(int index)
{
/* if crc was bad, use the default environment */
if (gd->env_valid)
return env_get_char_spec(index);
else
return default_environment[index];
return env_get_char_spec(index);
}
static uchar env_get_char_memory(int index)
{
if (gd->env_valid)
return *(uchar *)(gd->env_addr + index);
else
return default_environment[index];
return *(uchar *)(gd->env_addr + index);
}
uchar env_get_char(int index)
{
/* if relocated to RAM */
if (gd->flags & GD_FLG_RELOC)
/* if env is not set up, or crc was bad, use the default environment */
if (!gd->env_valid)
return default_environment[index];
else if (gd->flags & GD_FLG_RELOC) /* if relocated to RAM */
return env_get_char_memory(index);
else
return env_get_char_init(index);