projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-05-19-misc-fixes'
[oweals/u-boot.git]
/
env
/
sata.c
diff --git
a/env/sata.c
b/env/sata.c
index 16d8f939db6ccd3cdbaef5711d2812ac226dd4ce..8bfcc94306d3a2a8b12ba9f18379d901e0ce7628 100644
(file)
--- a/
env/sata.c
+++ b/
env/sata.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2010-2016 Freescale Semiconductor, Inc.
/*
* (C) Copyright 2010-2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* #define DEBUG */
*/
/* #define DEBUG */
@@
-9,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
@@
-24,8
+24,6
@@
#error CONFIG_ENV_OFFSET or CONFIG_ENV_SIZE not defined
#endif
#error CONFIG_ENV_OFFSET or CONFIG_ENV_SIZE not defined
#endif
-DECLARE_GLOBAL_DATA_PTR;
-
__weak int sata_get_env_dev(void)
{
return CONFIG_SYS_SATA_ENV_DEV;
__weak int sata_get_env_dev(void)
{
return CONFIG_SYS_SATA_ENV_DEV;
@@
-68,7
+66,7
@@
static int env_sata_save(void)
return 1;
printf("Writing to SATA(%d)...", env_sata);
return 1;
printf("Writing to SATA(%d)...", env_sata);
- if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET,
&
env_new)) {
+ if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET,
(u_char *)
env_new)) {
puts("failed\n");
return 1;
}
puts("failed\n");
return 1;
}
@@
-98,21
+96,22
@@
static void env_sata_load(void)
int env_sata;
if (sata_initialize())
int env_sata;
if (sata_initialize())
- return;
+ return
-EIO
;
env_sata = sata_get_env_dev();
sata = sata_get_dev(env_sata);
if (sata == NULL) {
env_sata = sata_get_env_dev();
sata = sata_get_dev(env_sata);
if (sata == NULL) {
- printf("Unknown SATA(%d) device for environment!\n",
- env_sata);
- return;
+ printf("Unknown SATA(%d) device for environment!\n", env_sata);
+ return -EIO;
}
}
- if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf))
- return set_default_env(NULL);
+ if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
+ env_set_default(NULL, 0);
+ return -EIO;
+ }
- env_import(buf, 1);
+
return
env_import(buf, 1);
}
U_BOOT_ENV_LOCATION(sata) = {
}
U_BOOT_ENV_LOCATION(sata) = {