X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=common%2Fenv_eeprom.c;h=1578d61e6bce019ebba9a45918ee28abfbde5033;hb=c2fff331a32ceca837d76eb7827d6340da270d52;hp=2adc129c67799cee1ecbf7124862d4b4a1d9a1d0;hpb=c9dca3c3f37d2647aec4509b24b16d15882ae3e4;p=u-boot

diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 2adc129c67..1578d61e6b 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -38,16 +35,12 @@ env_t *env_ptr = NULL;
 
 char * env_name_spec = "EEPROM";
 
-extern uchar (*env_get_char)(int);
-extern uchar env_get_char_memory (int index);
-
-
 uchar env_get_char_spec (int index)
 {
 	uchar c;
 
-	eeprom_read (CFG_DEF_EEPROM_ADDR,
-		     CFG_ENV_OFFSET+index+offsetof(env_t,data),
+	eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR,
+		     CONFIG_ENV_OFFSET+index+offsetof(env_t,data),
 		     &c, 1);
 
 	return (c);
@@ -55,18 +48,18 @@ uchar env_get_char_spec (int index)
 
 void env_relocate_spec (void)
 {
-	eeprom_read (CFG_DEF_EEPROM_ADDR,
-		     CFG_ENV_OFFSET,
+	eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR,
+		     CONFIG_ENV_OFFSET,
 		     (uchar*)env_ptr,
-		     CFG_ENV_SIZE);
+		     CONFIG_ENV_SIZE);
 }
 
 int saveenv(void)
 {
-	return eeprom_write (CFG_DEF_EEPROM_ADDR,
-			     CFG_ENV_OFFSET,
+	return eeprom_write (CONFIG_SYS_DEF_EEPROM_ADDR,
+			     CONFIG_ENV_OFFSET,
 			     (uchar *)env_ptr,
-			     CFG_ENV_SIZE);
+			     CONFIG_ENV_SIZE);
 }
 
 /************************************************************************
@@ -84,8 +77,8 @@ int env_init(void)
 	eeprom_init ();	/* prepare for EEPROM read/write */
 
 	/* read old CRC */
-	eeprom_read (CFG_DEF_EEPROM_ADDR,
-		     CFG_ENV_OFFSET+offsetof(env_t,crc),
+	eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR,
+		     CONFIG_ENV_OFFSET+offsetof(env_t,crc),
 		     (uchar *)&crc, sizeof(ulong));
 
 	new = 0;
@@ -94,7 +87,7 @@ int env_init(void)
 	while (len > 0) {
 		int n = (len > sizeof(buf)) ? sizeof(buf) : len;
 
-		eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, buf, n);
+		eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, buf, n);
 		new = crc32 (new, buf, n);
 		len -= n;
 		off += n;
@@ -110,5 +103,3 @@ int env_init(void)
 
 	return (0);
 }
-
-#endif /* CFG_ENV_IS_IN_EEPROM */