5 files changed, 6 insertions, 6 deletions
diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index 1a95755ab4..b6b37ef34f 100644
--- a/board/eltec/bab7xx/u-boot.lds
+++ b/board/eltec/bab7xx/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
-/*    common/environment.o(.text) */
+/*    common/env_embedded.o(.text) */
 
     *(.text)
     *(.fixup)
diff --git a/board/eltec/elppc/misc.c b/board/eltec/elppc/misc.c
index 5fb20ae66c..5e3a81c6e1 100644
--- a/board/eltec/elppc/misc.c
+++ b/board/eltec/elppc/misc.c
@@ -42,7 +42,7 @@ extern int read_eeprom (struct eth_device *dev, int location, int addr_len);
 void *nvram_read (void *dest, const long src, size_t count)
 {
 	uchar *d = (uchar *) dest;
-	uchar *s = (uchar *) (CFG_ENV_MAP_ADRS + src);
+	uchar *s = (uchar *) (CONFIG_ENV_MAP_ADRS + src);
 
 	while (count--)
 		*d++ = *s++;
@@ -52,7 +52,7 @@ void *nvram_read (void *dest, const long src, size_t count)
 
 void nvram_write (long dest, const void *src, size_t count)
 {
-	uchar *d = (uchar *) (CFG_ENV_MAP_ADRS + dest);
+	uchar *d = (uchar *) (CONFIG_ENV_MAP_ADRS + dest);
 	uchar *s = (uchar *) src;
 
 	while (count--)
diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds
index 1a95755ab4..b6b37ef34f 100644
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
-/*    common/environment.o(.text) */
+/*    common/env_embedded.o(.text) */
 
     *(.text)
     *(.fixup)
diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds
index 85117aa56e..465566d7ab 100644
--- a/board/eltec/mhpc/u-boot.lds
+++ b/board/eltec/mhpc/u-boot.lds
@@ -53,7 +53,7 @@ SECTIONS
   .text      :
   {
     cpu/mpc8xx/start.o	(.text)
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index 85072feda4..dbec9860a9 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/crc32.o		(.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)