diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:17 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 08:31:24 -0400 |
| commit | c5951991942330c129f3b181e94969d7c01e9abb (patch) | |
| tree | 39b5ee4ee37e5a595e088456e792d7251f7ee1ca /env/nvram.c | |
| parent | 21f639446d6bccb6cc550140d36bd3ebd74fcee8 (diff) | |
| download | u-boot-c5951991942330c129f3b181e94969d7c01e9abb.tar.gz | |
env: Adjust the load() method to return an error
The load() methods have inconsistent behaviour on error. Some of them load
an empty default environment. Some load an environment containing an error
message. Others do nothing.
As a step in the right direction, have the method return an error code.
Then the caller could handle this itself in a consistent way.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'env/nvram.c')
| -rw-r--r-- | env/nvram.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/env/nvram.c b/env/nvram.c index 85af37d4a0..5fb3115ce6 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -51,7 +51,7 @@ static int env_nvram_get_char(int index) } #endif -static void env_nvram_load(void) +static int env_nvram_load(void) { char buf[CONFIG_ENV_SIZE]; @@ -61,6 +61,8 @@ static void env_nvram_load(void) memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE); #endif env_import(buf, 1); + + return 0; } static int env_nvram_save(void) |