dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-22 10:31:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

env: Move get/set_default_env() to env.h

Browse Source 
Move these functions to the new header file and rename set_default_env()
to env_set_default() so that it has a consistent env_ prefix.

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-08-01 09:47:00 -06:00
committed by Tom Rini
parent 1f3db0c135
commit 0ac7d722ed
15 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
env/nand.c vendored
View File

@@ -15,6 +15,7 @@
#include <common.h>
#include <command.h>
#include <env.h>
#include <environment.h>
#include <linux/stddef.h>
#include <malloc.h>
@@ -325,7 +326,7 @@ static int env_nand_load(void)
tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
if (tmp_env1 == NULL || tmp_env2 == NULL) {
puts("Can't allocate buffers for environment\n");
set_default_env("malloc() failed", 0);
env_set_default("malloc() failed", 0);
ret = -EIO;
goto done;
}
@@ -364,14 +365,14 @@ static int env_nand_load(void)
if (mtd && !get_nand_env_oob(mtd, &nand_env_oob_offset)) {
printf("Found Environment offset in OOB..\n");
} else {
set_default_env("no env offset in OOB", 0);
env_set_default("no env offset in OOB", 0);
return;
}
#endif
ret = readenv(CONFIG_ENV_OFFSET, (u_char *)buf);
if (ret) {
set_default_env("readenv() failed", 0);
env_set_default("readenv() failed", 0);
return -EIO;
}