linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

env: Fix env_load_location

Browse Source 
Commit 7d714a24d7 ("env: Support multiple environments") added
static variable env_load_location. When saving environmental
variables, this variable is presumed to have the value set before.
In case the value was set before relocation and U-Boot runs from a
NOR flash, this variable wasn't writable. This causes failure when
saving the environment. To save this location, global data must be
used instead.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
York Sun
2018-02-07 14:17:11 -08:00
committed by Tom Rini
parent 32fe36574e
commit e1caa5841e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
env/env.c vendored
View File

@ -62,8 +62,6 @@ static enum env_location env_locations[] = {
#endif #endif
}; };
static enum env_location env_load_location = ENVL_UNKNOWN;
static bool env_has_inited(enum env_location location) static bool env_has_inited(enum env_location location)
{ {
return gd->env_has_init & BIT(location); return gd->env_has_init & BIT(location);
@ -108,11 +106,11 @@ __weak enum env_location env_get_location(enum env_operation op, int prio)
if (prio >= ARRAY_SIZE(env_locations)) if (prio >= ARRAY_SIZE(env_locations))
return ENVL_UNKNOWN; return ENVL_UNKNOWN;
env_load_location = env_locations[prio]; gd->env_load_location = env_locations[prio];
return env_load_location; return gd->env_load_location;
case ENVOP_SAVE: case ENVOP_SAVE:
return env_load_location; return gd->env_load_location;
} }
return ENVL_UNKNOWN; return ENVL_UNKNOWN;

1
include/asm-generic/global_data.h
View File

@ -51,6 +51,7 @@ typedef struct global_data {
unsigned long env_addr; /* Address of Environment struct */ unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Environment valid? enum env_valid */ unsigned long env_valid; /* Environment valid? enum env_valid */
unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */ unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */
int env_load_location;
unsigned long ram_top; /* Top address of RAM used by U-Boot */ unsigned long ram_top; /* Top address of RAM used by U-Boot */
unsigned long relocaddr; /* Start address of U-Boot in RAM */ unsigned long relocaddr; /* Start address of U-Boot in RAM */

2
include/environment.h
View File

@ -188,6 +188,7 @@ enum env_valid {
}; };
enum env_location { enum env_location {
ENVL_UNKNOWN,
ENVL_EEPROM, ENVL_EEPROM,
ENVL_EXT4, ENVL_EXT4,
ENVL_FAT, ENVL_FAT,
@ -202,7 +203,6 @@ enum env_location {
ENVL_NOWHERE, ENVL_NOWHERE,
ENVL_COUNT, ENVL_COUNT,
ENVL_UNKNOWN,
}; };
/* value for the various operations we want to perform on the env */ /* value for the various operations we want to perform on the env */