X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=env%2Fnvram.c;h=1a9fcf1c069ad110b21884b5040745c4caa1d717;hb=18b9c98024ec89e00a57707f07ff6ada06089d26;hp=7cc62b631ecc9cac27b18f10a992b572da403b69;hpb=7961b9f6db19d039b4e6e9c21a9715b6d5b92393;p=oweals%2Fu-boot.git

diff --git a/env/nvram.c b/env/nvram.c
index 7cc62b631e..1a9fcf1c06 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
-
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
@@ -26,10 +25,12 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
+#include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -37,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
 #else
-env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
+static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE