X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=env%2Fnvram.c;h=df1b37913d57d8f0a03edbd6cb5ac97e75aa6676;hb=4f0b061444063d7c60e9624c5431c16f00d067af;hp=5fb3115ce65af3db82429e8311c3d507adc6fa47;hpb=c5951991942330c129f3b181e94969d7c01e9abb;p=oweals%2Fu-boot.git

diff --git a/env/nvram.c b/env/nvram.c
index 5fb3115ce6..df1b37913d 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+
  */
 
 /*
@@ -41,7 +40,10 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-static int env_nvram_get_char(int index)
+/** Call this function from overridden env_get_char_spec() if you need
+ * this functionality.
+ */
+int env_nvram_get_char(int index)
 {
 	uchar c;
 
@@ -60,9 +62,7 @@ static int env_nvram_load(void)
 #else
 	memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
-	env_import(buf, 1);
-
-	return 0;
+	return env_import(buf, 1);
 }
 
 static int env_nvram_save(void)
@@ -106,7 +106,7 @@ static int env_nvram_init(void)
 		gd->env_valid = ENV_VALID;
 	} else {
 		gd->env_addr	= (ulong)&default_environment[0];
-		gd->env_valid	= 0;
+		gd->env_valid	= ENV_INVALID;
 	}
 
 	return 0;
@@ -115,9 +115,6 @@ static int env_nvram_init(void)
 U_BOOT_ENV_LOCATION(nvram) = {
 	.location	= ENVL_NVRAM,
 	ENV_NAME("NVRAM")
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-	.get_char	= env_nvram_get_char,
-#endif
 	.load		= env_nvram_load,
 	.save		= env_save_ptr(env_nvram_save),
 	.init		= env_nvram_init,