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 b1a7d1a4c12e3d38e870b2f34a4ab36586355525..55faa1e5d0e8d2f9a0ed1563e1e826f094a5d3b8 100644
(file)
--- a/
env/remote.c
+++ b/
env/remote.c
@@
-7,7
+7,7
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
-#include <env
ironment
.h>
+#include <env
_internal
.h>
#include <linux/stddef.h>
#ifdef ENV_IS_EMBEDDED
#include <linux/stddef.h>
#ifdef ENV_IS_EMBEDDED
@@
-18,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) {