diff options
| author | York Sun <york.sun@nxp.com> | 2018-02-07 14:17:11 -0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-16 11:12:41 -0500 |
| commit | e1caa5841e8a9bc0ee658bdacae0519fa28e1e6a (patch) | |
| tree | 97f85fa34ef28e76d53a27eddd76fce321acb333 /include | |
| parent | 32fe36574ea5e6ea55313e16547b98a984af7767 (diff) | |
| download | u-boot-e1caa5841e8a9bc0ee658bdacae0519fa28e1e6a.tar.gz | |
env: Fix env_load_location
Commit 7d714a24d725 ("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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/global_data.h | 1 | ||||
| -rw-r--r-- | include/environment.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 1de67e8e8f..c16ad73864 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -51,6 +51,7 @@ typedef struct global_data { unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Environment valid? enum env_valid */ 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 relocaddr; /* Start address of U-Boot in RAM */ diff --git a/include/environment.h b/include/environment.h index 6044b9e1b4..d7037ccd93 100644 --- a/include/environment.h +++ b/include/environment.h @@ -188,6 +188,7 @@ enum env_valid { }; enum env_location { + ENVL_UNKNOWN, ENVL_EEPROM, ENVL_EXT4, ENVL_FAT, @@ -202,7 +203,6 @@ enum env_location { ENVL_NOWHERE, ENVL_COUNT, - ENVL_UNKNOWN, }; /* value for the various operations we want to perform on the env */ |