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 'master' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
env
/
remote.c
diff --git
a/env/remote.c
b/env/remote.c
index c5dce5b9662cb5af1647836745020b0560568561..55faa1e5d0e8d2f9a0ed1563e1e826f094a5d3b8 100644
(file)
--- a/
env/remote.c
+++ b/
env/remote.c
@@
-1,18
+1,15
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2011-2012 Freescale Semiconductor, Inc.
/*
* (C) Copyright 2011-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* #define DEBUG */
#include <common.h>
#include <command.h>
*/
/* #define DEBUG */
#include <common.h>
#include <command.h>
-#include <env
ironment
.h>
+#include <env
_internal
.h>
#include <linux/stddef.h>
#include <linux/stddef.h>
-char *env_name_spec = "Remote";
-
#ifdef ENV_IS_EMBEDDED
env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */
#ifdef ENV_IS_EMBEDDED
env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */
@@
-21,10
+18,6
@@
env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if !defined(CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_OFFSET 0
-#endif
-
static int env_remote_init(void)
{
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
static int env_remote_init(void)
{
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
@@
-48,15
+41,18
@@
static int env_remote_save(void)
}
#endif /* CONFIG_CMD_SAVEENV */
}
#endif /* CONFIG_CMD_SAVEENV */
-static
void
env_remote_load(void)
+static
int
env_remote_load(void)
{
#ifndef ENV_IS_EMBEDDED
{
#ifndef ENV_IS_EMBEDDED
- env_import((char *)env_ptr, 1);
+
return
env_import((char *)env_ptr, 1);
#endif
#endif
+
+ return 0;
}
U_BOOT_ENV_LOCATION(remote) = {
.location = ENVL_REMOTE,
}
U_BOOT_ENV_LOCATION(remote) = {
.location = ENVL_REMOTE,
+ ENV_NAME("Remote")
.load = env_remote_load,
.save = env_save_ptr(env_remote_save),
.init = env_remote_init,
.load = env_remote_load,
.save = env_save_ptr(env_remote_save),
.init = env_remote_init,