projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env/sf.c: drop private CMD_SAVEENV logic
[oweals/u-boot.git]
/
env
/
sata.c
diff --git
a/env/sata.c
b/env/sata.c
index a2ff5c66f7c92b3c293303b9e48328030b18cf71..8bfcc94306d3a2a8b12ba9f18379d901e0ce7628 100644
(file)
--- a/
env/sata.c
+++ b/
env/sata.c
@@
-8,14
+8,15
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
#include <linux/stddef.h>
#include <errno.h>
#include <memalign.h>
#include <sata.h>
#include <search.h>
#include <linux/stddef.h>
#include <errno.h>
#include <memalign.h>
#include <sata.h>
#include <search.h>
-#if defined(CONFIG_ENV_
SIZE_REDUND) || defined(CONFIG_ENV_
OFFSET_REDUND)
+#if defined(CONFIG_ENV_OFFSET_REDUND)
#error ENV REDUND not supported
#endif
#error ENV REDUND not supported
#endif
@@
-106,7
+107,7
@@
static void env_sata_load(void)
}
if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
}
if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
-
set_default_env
(NULL, 0);
+
env_set_default
(NULL, 0);
return -EIO;
}
return -EIO;
}