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/flash.c | |
| parent | 21f639446d6bccb6cc550140d36bd3ebd74fcee8 (diff) | |
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/flash.c')
| -rw-r--r-- | env/flash.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/env/flash.c b/env/flash.c index 2d72c51622..b60be57a8d 100644 --- a/env/flash.c +++ b/env/flash.c @@ -308,7 +308,7 @@ done: #endif /* CONFIG_ENV_ADDR_REDUND */ #ifdef LOADENV -static void env_flash_load(void) +static int env_flash_load(void) { #ifdef CONFIG_ENV_ADDR_REDUND if (gd->env_addr != (ulong)&(flash_addr->data)) { @@ -352,6 +352,8 @@ static void env_flash_load(void) #endif /* CONFIG_ENV_ADDR_REDUND */ env_import((char *)flash_addr, 1); + + return 0; } #endif /* LOADENV */ |