projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
env
/
remote.c
diff --git
a/env/remote.c
b/env/remote.c
index
c013fdd
..
d93a137
100644
(file)
--- a/
env/remote.c
+++ b/
env/remote.c
@@
-1,28
+1,24
@@
+// 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>
+#include <u-boot/crc.h>
#ifdef ENV_IS_EMBEDDED
#ifdef ENV_IS_EMBEDDED
-env_t *env_ptr = &environment;
+
static
env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */
#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
+
static
env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif /* ENV_IS_EMBEDDED */
DECLARE_GLOBAL_DATA_PTR;
#endif /* ENV_IS_EMBEDDED */
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) {
@@
-49,7
+45,7
@@
static int env_remote_save(void)
static int env_remote_load(void)
{
#ifndef ENV_IS_EMBEDDED
static int env_remote_load(void)
{
#ifndef ENV_IS_EMBEDDED
-
env_import((char *)env_ptr, 1
);
+
return env_import((char *)env_ptr, 1, H_EXTERNAL
);
#endif
return 0;
#endif
return 0;