rename environment.c in env_embedded.c to reflect is functionality

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/Makefile b/Makefile
index b2a485320177ab0502c8d335a504a7941b87bd48..4246f93eb045aee63c2498980f0f664e843a90f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3213,7 +3213,7 @@ clobber:  clean
        @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
-       @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
+       @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
        @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h}
        @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c

diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
index 4a880e68973599126aeb5119b7eb7d40ef3a6115..b22b332c49a7c5da2b6bc08c5055918090024b0d 100644 (file)
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o (.text)
 
 /*    . = env_offset; */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index 7b1440b3650475578e95f742a0e7dbd42cac5c95..40a611adb72a0c8810c887dce82d0b58315c095c 100644 (file)
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -77,7 +77,7 @@ SECTIONS
     lib_ppc/ticks.o                    (.text)
 
     . = env_offset;
-    common/environment.o               (.text)
+    common/env_embedded.o              (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index 357867054c695b9ad1854ce77d6d18b07c2cbdbd..434c9b71d386b0f9e13c9b077bafdfe967fe2b2d 100644 (file)
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -70,7 +70,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
 
     . = env_offset;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds
index 7386ea7a2525127ef600666b9b912137db66eba6..e107b479c142c3d5e3b07a22232eaa4ef115efe7 100644 (file)
--- a/board/MAI/AmigaOneG3SE/u-boot.lds
+++ b/board/MAI/AmigaOneG3SE/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     cpu/74xx_7xx/start.o       (.text)
 /* 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/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- a/board/Marvell/db64360/u-boot.lds
+++ b/board/Marvell/db64360/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/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- a/board/Marvell/db64460/u-boot.lds
+++ b/board/Marvell/db64460/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/MigoR/u-boot.lds b/board/MigoR/u-boot.lds
index 692bc62918e48f2ab0088697e1ea127d426e0f48..f9c1effa4485794223ed0c9d26dc991811f5770c 100644 (file)
--- a/board/MigoR/u-boot.lds
+++ b/board/MigoR/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index 1f9a191d4736171bde7b7b1f95a04669613f1e61..271ac766f6d2af48dd039e54d2105da26a756b18 100644 (file)
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
 /* XXX ?
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index c33581d25035df5873b5b6c311f0a0380295b16b..ea8538900c0a4802bc67fce9e71e8e91a875c53b 100644 (file)
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/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)

diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index 1f9a191d4736171bde7b7b1f95a04669613f1e61..271ac766f6d2af48dd039e54d2105da26a756b18 100644 (file)
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
 /* XXX ?
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index c33581d25035df5873b5b6c311f0a0380295b16b..ea8538900c0a4802bc67fce9e71e8e91a875c53b 100644 (file)
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/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)

diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index 2ee12069d747325bd683d077cd48ba80ece33f08..8ccffa217fb9ca76bb51df7a295138335a812768 100644 (file)
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
 /* XXX ?
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug
index f6d153763981fc768be1982efc2c223a75a796a9..0f6ae696d8a38e9c77f11d865872bd3184abcc4b 100644 (file)
--- a/board/RPXlite_dw/u-boot.lds.debug
+++ b/board/RPXlite_dw/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)

diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index 9e767ee40978369f380866d109cd4efc738f9e0a..ce1148d958a3539533c4e0eaf4f373b1187749cb 100644 (file)
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = env_offset;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 0de78d32a91ee72776b3a20218b58b6a04e00601..ae9b36c64c7f2648041bbaeda29ce3b5f55b8d8f 100644 (file)
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -37,7 +37,7 @@ SECTIONS
                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
                . = env_offset;
-               common/environment.o(.ppcenv)
+               common/env_embedded.o(.ppcenv)
                * (.text)
        }
 

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 90cafce6ce28b38d318f42afa328745bccebf8e2..d1f7a0a40cb8cf982b9223284cd223aa4d3b16a7 100644 (file)
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -38,7 +38,7 @@ SECTIONS
                cpu/ixp/cpu.o(.text)
 
                . = env_offset;
-               common/environment.o (.ppcenv)
+               common/env_embedded.o (.ppcenv)
 
                * (.text)
        }

diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index b9a9eb9ffaa5181f1d805124195650750ab007ed..114e5a88a6ee2bf5f00f7ee9bb1bdc8427407bce 100644 (file)
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -38,7 +38,7 @@ SECTIONS
                cpu/ixp/cpu.o (.text)
 
                . = env_offset;
-               common/environment.o (.ppcenv)
+               common/env_embedded.o (.ppcenv)
 
                * (.text)
        }

diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds
index cbdc0b0500e9c3db7a733569adc4f8b99b873091..bfe2769af5f715c048f1f6f1ae8b6aae14d93f60 100644 (file)
--- a/board/amcc/acadia/u-boot-nand.lds
+++ b/board/amcc/acadia/u-boot-nand.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
-    common/environment.o  (.ppcenv)
+    common/env_embedded.o  (.ppcenv)
     /* Keep some space here for redundant env and potential bad env blocks */
     . = ALIGN(0x10000);
 

diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds
index cbdc0b0500e9c3db7a733569adc4f8b99b873091..bfe2769af5f715c048f1f6f1ae8b6aae14d93f60 100644 (file)
--- a/board/amcc/bamboo/u-boot-nand.lds
+++ b/board/amcc/bamboo/u-boot-nand.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
-    common/environment.o  (.ppcenv)
+    common/env_embedded.o  (.ppcenv)
     /* Keep some space here for redundant env and potential bad env blocks */
     . = ALIGN(0x10000);
 

diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds
index 8a4b7f5d0decc830e4e6fd1810f4ac68c3d3e8ea..6e871cfa24b172747741486a9b8339104eb957d6 100644 (file)
--- a/board/amcc/canyonlands/u-boot-nand.lds
+++ b/board/amcc/canyonlands/u-boot-nand.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     /* Align to next NAND block */
     . = ALIGN(0x20000);
-    common/environment.o  (.ppcenv)
+    common/env_embedded.o  (.ppcenv)
     /* Keep some space here for redundant env and potential bad env blocks */
     . = ALIGN(0x80000);
 

diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds
index cbdc0b0500e9c3db7a733569adc4f8b99b873091..bfe2769af5f715c048f1f6f1ae8b6aae14d93f60 100644 (file)
--- a/board/amcc/kilauea/u-boot-nand.lds
+++ b/board/amcc/kilauea/u-boot-nand.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
-    common/environment.o  (.ppcenv)
+    common/env_embedded.o  (.ppcenv)
     /* Keep some space here for redundant env and potential bad env blocks */
     . = ALIGN(0x10000);
 

diff --git a/board/amcc/redwood/u-boot.lds b/board/amcc/redwood/u-boot.lds
index 2104cc2a3b66754681f69c902cf72b61d2de0379..8091dac3f05f0f4aecec60c47acef5c71a590aae 100644 (file)
--- a/board/amcc/redwood/u-boot.lds
+++ b/board/amcc/redwood/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     board/amcc/redwood/init.o  (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds
index ae2e18de4e79657b368eea9d8a3d0996567436fa..6608e659203ecc4faca88d7f7984b2edb371abc0 100644 (file)
--- a/board/amcc/sequoia/u-boot-nand.lds
+++ b/board/amcc/sequoia/u-boot-nand.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
-    common/environment.o  (.ppcenv)
+    common/env_embedded.o  (.ppcenv)
     /* Keep some space here for redundant env and potential bad env blocks */
     . = ALIGN(0x10000);
 

diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index a939e03311ec3ffb5888a4835fe5de90c4400f7a..f5a5616c76ad6a83664b4a45e86618e4bdab1ec1 100644 (file)
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -69,7 +69,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/ap325rxa/u-boot.lds b/board/ap325rxa/u-boot.lds
index a670374580547538a52ddccb78e87876cb72564f..015f58b45ed7c48465ad6a23734a1895cdfe638e 100644 (file)
--- a/board/ap325rxa/u-boot.lds
+++ b/board/ap325rxa/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/bf533-ezkit/u-boot.lds.S b/board/bf533-ezkit/u-boot.lds.S
index e4b83d11dc262ea0c34feb252b0c8c3ab207b94d..1fedbc5fb7b175deca988ef5e899c1af43e2ac93 100644 (file)
--- a/board/bf533-ezkit/u-boot.lds.S
+++ b/board/bf533-ezkit/u-boot.lds.S
@@ -71,7 +71,7 @@ SECTIONS
                board/bf533-ezkit/bf533-ezkit.o         (.text)
 
                . = DEFINED(env_offset) ? env_offset : .;
-               common/environment.o    (.text)
+               common/env_embedded.o   (.text)
 #endif
 
                *(.text .text.*)

diff --git a/board/bf533-stamp/u-boot.lds.S b/board/bf533-stamp/u-boot.lds.S
index 01780c570c90145817e23b01c206d55ff8bf9f3c..4e7fd7c04190be77777919c7082ea1e477e97b15 100644 (file)
--- a/board/bf533-stamp/u-boot.lds.S
+++ b/board/bf533-stamp/u-boot.lds.S
@@ -69,7 +69,7 @@ SECTIONS
                lib_generic/crc32.o             (.text)
 
                . = DEFINED(env_offset) ? env_offset : .;
-               common/environment.o    (.text)
+               common/env_embedded.o   (.text)
 #endif
 
                *(.text .text.*)

diff --git a/board/bf537-stamp/u-boot.lds.S b/board/bf537-stamp/u-boot.lds.S
index 01780c570c90145817e23b01c206d55ff8bf9f3c..4e7fd7c04190be77777919c7082ea1e477e97b15 100644 (file)
--- a/board/bf537-stamp/u-boot.lds.S
+++ b/board/bf537-stamp/u-boot.lds.S
@@ -69,7 +69,7 @@ SECTIONS
                lib_generic/crc32.o             (.text)
 
                . = DEFINED(env_offset) ? env_offset : .;
-               common/environment.o    (.text)
+               common/env_embedded.o   (.text)
 #endif
 
                *(.text .text.*)

diff --git a/board/bf561-ezkit/u-boot.lds.S b/board/bf561-ezkit/u-boot.lds.S
index ddafdcb2af4273d70c94c3193a76abc0f811ad4f..ab5ef0881d44216653fad509c873a9a1cc1e2537 100644 (file)
--- a/board/bf561-ezkit/u-boot.lds.S
+++ b/board/bf561-ezkit/u-boot.lds.S
@@ -71,7 +71,7 @@ SECTIONS
                board/bf561-ezkit/bf561-ezkit.o         (.text)
 
                . = DEFINED(env_offset) ? env_offset : .;
-               common/environment.o    (.text)
+               common/env_embedded.o   (.text)
 #endif
 
                *(.text .text.*)

diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 10b38ec356c24615d673e7586642c6ed30b4f388..2229f61a4bbd8dcbb65487a633ba54ecbdabd700 100644 (file)
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index 85072feda47ce32de1b81d1da925745e627ebf41..dbec9860a92a20a0969babd7d912a87e56f7e0ab 100644 (file)
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/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)

diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index f99a236a316d681e18ec38a5c4c124eafe0998d1..bed11777edb352a42dc11b4fcb10c319c31ec2f5 100644 (file)
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds
index 59d62e101185ad9cf0c6d80b641be6ba3f1d1dd9..e9f05d3c7a9dd99deb5867f72ca147fdbd073253 100644 (file)
--- a/board/cogent/u-boot.lds
+++ b/board/cogent/u-boot.lds
@@ -53,7 +53,7 @@ SECTIONS
   .text      :
   {
     *(.text)
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.fixup)
     *(.got1)
   }

diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index c33581d25035df5873b5b6c311f0a0380295b16b..ea8538900c0a4802bc67fce9e71e8e91a875c53b 100644 (file)
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/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)

diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds
index a6bbef3dcc0da31d5e8357ad04f9c629a444313f..9d37257f5c5bee2f2aff424119c602aa318399a9 100644 (file)
--- a/board/cray/L1/u-boot.lds
+++ b/board/cray/L1/u-boot.lds
@@ -75,7 +75,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*. = env_offset;*/
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index 0552994f40ee76ed1308a192894558bbacc634e9..338392a075986f34bf1c231a084488d0ceb8d74e 100644 (file)
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds
index 947fbd638244c40b2d484beeabfeb0d9d90b88f7..be381e17de2bad236c034efea6d3126d03aa9b6b 100644 (file)
--- a/board/csb272/u-boot.lds
+++ b/board/csb272/u-boot.lds
@@ -76,7 +76,7 @@ SECTIONS
     lib_ppc/board.o    (.text)
     lib_generic/zlib.o (.text)
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds
index de3643eed911e5feb8130f320539a8466ec2a462..375150db15b8884280205f710cf2defb58029db9 100644 (file)
--- a/board/csb472/u-boot.lds
+++ b/board/csb472/u-boot.lds
@@ -76,7 +76,7 @@ SECTIONS
     lib_ppc/board.o    (.text)
     lib_generic/zlib.o (.text)
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index 3037a049c3713a2915dd17bd12c547c1c107fe69..e42c76f8863eebb2435888a3b3ff4f91d1192a54 100644 (file)
--- a/board/dave/PPChameleonEVB/u-boot.lds
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -147,7 +147,7 @@ SECTIONS
   . = 0xFFFF8000;
   .ppcenv :
   {
-    common/environment.o(.ppcenv);
+    common/env_embedded.o(.ppcenv);
   }
 
   _end = . ;

diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- 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/u-boot.lds b/board/eltec/elppc/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- 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 85117aa56e3792367794cdec1ebe07f58040b4c6..465566d7abbf45682d3e5bffb1670942e36688b2 100644 (file)
--- 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 85072feda47ce32de1b81d1da925745e627ebf41..dbec9860a92a20a0969babd7d912a87e56f7e0ab 100644 (file)
--- 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)

diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 5d97095c12a431879a778c8a186219e5ca8b7320..82e8dce830371adb94cc9f3bd0683f1e7095403e 100644 (file)
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds
index 00e35a6b8d1737dd5846418ab20f7cc85373da97..153e71f891aaa87d1e4b806e004186a031918c6c 100644 (file)
--- a/board/eric/u-boot.lds
+++ b/board/eric/u-boot.lds
@@ -75,7 +75,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/apc405/u-boot.lds b/board/esd/apc405/u-boot.lds
index 21547ac275926d3c87b2a69d07e2a7e2d869f9d9..004be5154b6d729413ba8dfd267e1e37d016fbff 100644 (file)
--- a/board/esd/apc405/u-boot.lds
+++ b/board/esd/apc405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds
index 89cd067346a3d154c8385a0b93ac55cc87fe17d6..4a881b6eda8028c633304701a4e216691f87f89f 100644 (file)
--- a/board/esd/ar405/u-boot.lds
+++ b/board/esd/ar405/u-boot.lds
@@ -83,9 +83,9 @@ SECTIONS
 
 /*
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 */
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/ash405/u-boot.lds b/board/esd/ash405/u-boot.lds
index 644174a46db17765fd02f37311ed7c72323e2cab..fba3de8f00ad71479606201c48531e17676c5ad6 100644 (file)
--- a/board/esd/ash405/u-boot.lds
+++ b/board/esd/ash405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/canbt/u-boot.lds b/board/esd/canbt/u-boot.lds
index 71bac09f232f6b8300566bb8dd20ef9b0025be1f..bf3f534607c42d7d89182e349b70c0175c5588e5 100644 (file)
--- a/board/esd/canbt/u-boot.lds
+++ b/board/esd/canbt/u-boot.lds
@@ -82,7 +82,7 @@ SECTIONS
     net/net.o                  (.text)
 
 /*    . = env_offset;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 */
 
     *(.text)

diff --git a/board/esd/cms700/u-boot.lds b/board/esd/cms700/u-boot.lds
index 21547ac275926d3c87b2a69d07e2a7e2d869f9d9..004be5154b6d729413ba8dfd267e1e37d016fbff 100644 (file)
--- a/board/esd/cms700/u-boot.lds
+++ b/board/esd/cms700/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/cpci2dp/u-boot.lds b/board/esd/cpci2dp/u-boot.lds
index 21547ac275926d3c87b2a69d07e2a7e2d869f9d9..004be5154b6d729413ba8dfd267e1e37d016fbff 100644 (file)
--- a/board/esd/cpci2dp/u-boot.lds
+++ b/board/esd/cpci2dp/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/cpci750/u-boot.lds b/board/esd/cpci750/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- a/board/esd/cpci750/u-boot.lds
+++ b/board/esd/cpci750/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/esd/cpciiser4/u-boot.lds b/board/esd/cpciiser4/u-boot.lds
index 21547ac275926d3c87b2a69d07e2a7e2d869f9d9..004be5154b6d729413ba8dfd267e1e37d016fbff 100644 (file)
--- a/board/esd/cpciiser4/u-boot.lds
+++ b/board/esd/cpciiser4/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds
index 6126b1603225284c2b9e075dc65b092f1bcc3916..f97da2d611fdfbc2d86f197df9cc9b731169c1a6 100644 (file)
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds
@@ -86,7 +86,7 @@ SECTIONS
     net/bootp.o        (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/dp405/u-boot.lds b/board/esd/dp405/u-boot.lds
index d70d37934e4e32457128ac7db6626d71e9aca714..7ff074c152ed5a6369351280009248d6a52b76e6 100644 (file)
--- a/board/esd/dp405/u-boot.lds
+++ b/board/esd/dp405/u-boot.lds
@@ -73,7 +73,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/du405/u-boot.lds b/board/esd/du405/u-boot.lds
index 46ef7e72ab750b65abb088e650ababf50573d18e..37c5ea7f08c8796787c98e77cfcbd914cc61f493 100644 (file)
--- a/board/esd/du405/u-boot.lds
+++ b/board/esd/du405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/hh405/u-boot.lds b/board/esd/hh405/u-boot.lds
index 21547ac275926d3c87b2a69d07e2a7e2d869f9d9..004be5154b6d729413ba8dfd267e1e37d016fbff 100644 (file)
--- a/board/esd/hh405/u-boot.lds
+++ b/board/esd/hh405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/hub405/u-boot.lds b/board/esd/hub405/u-boot.lds
index f21c7aad4bb2eff3d4aa020d260d008e4e5eb7d4..c4a1a4bc836501dc1c905ef13340db798da6535c 100644 (file)
--- a/board/esd/hub405/u-boot.lds
+++ b/board/esd/hub405/u-boot.lds
@@ -73,7 +73,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/ocrtc/u-boot.lds b/board/esd/ocrtc/u-boot.lds
index 5fb96994469a98d86b03469622897b7d9d235667..42ad8491464402a3bf9b2c229ba679be5b58bab8 100644 (file)
--- a/board/esd/ocrtc/u-boot.lds
+++ b/board/esd/ocrtc/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/pci405/u-boot.lds b/board/esd/pci405/u-boot.lds
index 21547ac275926d3c87b2a69d07e2a7e2d869f9d9..004be5154b6d729413ba8dfd267e1e37d016fbff 100644 (file)
--- a/board/esd/pci405/u-boot.lds
+++ b/board/esd/pci405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/pmc405/u-boot.lds b/board/esd/pmc405/u-boot.lds
index 81ee614f65b24dfc8d4f7f56c08422f33e8db44d..87449d49a8a7fcef1972a36227b660b6fade5475 100644 (file)
--- a/board/esd/pmc405/u-boot.lds
+++ b/board/esd/pmc405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds
index ae2e18de4e79657b368eea9d8a3d0996567436fa..6608e659203ecc4faca88d7f7984b2edb371abc0 100644 (file)
--- a/board/esd/pmc440/u-boot-nand.lds
+++ b/board/esd/pmc440/u-boot-nand.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
-    common/environment.o  (.ppcenv)
+    common/env_embedded.o  (.ppcenv)
     /* Keep some space here for redundant env and potential bad env blocks */
     . = ALIGN(0x10000);
 

diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index afdb7202ca86cd9af7a5154e7acc39d6624b6fff..aec7e9bf43a7919b79a45d108fd10decba2b31e6 100644 (file)
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/voh405/u-boot.lds b/board/esd/voh405/u-boot.lds
index d70d37934e4e32457128ac7db6626d71e9aca714..7ff074c152ed5a6369351280009248d6a52b76e6 100644 (file)
--- a/board/esd/voh405/u-boot.lds
+++ b/board/esd/voh405/u-boot.lds
@@ -73,7 +73,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esd/wuh405/u-boot.lds b/board/esd/wuh405/u-boot.lds
index 644174a46db17765fd02f37311ed7c72323e2cab..fba3de8f00ad71479606201c48531e17676c5ad6 100644 (file)
--- a/board/esd/wuh405/u-boot.lds
+++ b/board/esd/wuh405/u-boot.lds
@@ -72,7 +72,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index acaf4e34fc1693511b7bc6fbc1ba590aaf6e32f9..cdc3cccdfdf3e0541891eae6d1264b5b837b8e17 100644 (file)
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index 5313bd40a558c59cc18bd8a1b163b1ad1d1b7aad..4ed75705b62aa60fcb78a8de5fd2f2d8a32111ff 100644 (file)
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.text)
     *(.fixup)
     *(.got1)

diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 06115ead8281704fd56a197384c1266278cf740c..28f8804dcc161974b3c60d7dc81e7e6e0f4ac987 100644 (file)
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -68,7 +68,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- a/board/evb64260/u-boot.lds
+++ b/board/evb64260/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/exbitgen/u-boot.lds b/board/exbitgen/u-boot.lds
index e4faa446ee094316279652dde1ccf9dce5411546..cf66426357dc77865808689416d66c8529d97dd1 100644 (file)
--- a/board/exbitgen/u-boot.lds
+++ b/board/exbitgen/u-boot.lds
@@ -74,7 +74,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds
index c7571e49967fa831f7bf59e03ffd6ff7101fe3f2..8e408a6efc05bca7e74e1a3302a40f4a4243084d 100644 (file)
--- a/board/fads/u-boot.lds
+++ b/board/fads/u-boot.lds
@@ -53,7 +53,7 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
 
     /*. = DEFINED(env_offset) ? env_offset : .;*/
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index fd2245f57ba8de452951c983f02c6a89c315fe21..67d37ae33449e158c434c09896bd55426175a8fd 100644 (file)
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index 85072feda47ce32de1b81d1da925745e627ebf41..dbec9860a92a20a0969babd7d912a87e56f7e0ab 100644 (file)
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/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)

diff --git a/board/freescale/m52277evb/u-boot.lds b/board/freescale/m52277evb/u-boot.lds
index 098e9d3464fa4ae1f8f5b8d0053852c29a0af025..7ae70d455fa15283804fda84f7a01e57ad1321d2 100644 (file)
--- a/board/freescale/m52277evb/u-boot.lds
+++ b/board/freescale/m52277evb/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     common/main.o              (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16
index 4ca026fc5327dfc58dfe5fbf70aaa6fe065e4078..c134884375dedb224d784024efdf46bbc1a6c550 100644 (file)
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index eeffdfb4e7e55a13fd5cb801b794771427eec7d3..53c337df893e3efe580f99ff89514fa0b24ec261 100644 (file)
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -71,7 +71,7 @@ SECTIONS
     lib_generic/libgeneric.a   (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5235evb/u-boot.lds b/board/freescale/m5235evb/u-boot.lds
index 33133a0fcd455119e280a485a53b2069a9122f52..c0611b9ce3396e50a06e6a599c9ade6dff675c3a 100644 (file)
--- a/board/freescale/m5235evb/u-boot.lds
+++ b/board/freescale/m5235evb/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index afdb7202ca86cd9af7a5154e7acc39d6624b6fff..aec7e9bf43a7919b79a45d108fd10decba2b31e6 100644 (file)
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index 4bdea5ed5f5cac5c2f0d0fb1bb890895bd0f759b..a2957645767a9e4131ba4a50e592d7e2e2fb20f7 100644 (file)
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
 
     *(.text)

diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 6d225f5281910e50396b71fd5755839b666ad36e..239cf95e5db12a5bac1cc3e4970c9bcd1933ef93 100644 (file)
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index c07d02383458d92cbb1fbd0f0a61ae59d3a24e29..0bc7fa1ab9e6eccc70d57d3127892c03db48e685 100644 (file)
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index 8420c91a7c6afcd344d92fc9144859396407d595..e5c7b67c69c8fcb174c005c7b1da83792f6efb98 100644 (file)
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds
index d810ebc144125673607600852238a2f6746a36e8..a3e03d556c337d76db654af2dd4005e025778185 100644 (file)
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds
index 96fde65382185655217693015c4bfb4f41f6c8ec..707b228afd6cb0bdc58e8873aa47695976577e81 100644 (file)
--- a/board/freescale/m5282evb/u-boot.lds
+++ b/board/freescale/m5282evb/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/crc32.o        (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index 1ddfbc47064d23bf311cb5e512237940a342a9b1..c9da922aea6fadef2def44ab48bab8e6ab6d471f 100644 (file)
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index d30a401be93ed146d3df5e64516b68dcea1f88fb..fcf1ff1d828982a8b0e797ff9e604623163eb74b 100644 (file)
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index 22c60486539c4a8b505894ebe26b0e678ba186f6..08e184c1e66cbcdffa69ae0ee43f274bf22d0c4c 100644 (file)
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index 0752e271514ac4dd84355e0d61b008bb29da8af8..e9eac67b90ed074977434d759c05976448aa30cd 100644 (file)
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -68,7 +68,7 @@ SECTIONS
     board/freescale/m54455evb/m54455evb.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 */
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index 22c60486539c4a8b505894ebe26b0e678ba186f6..08e184c1e66cbcdffa69ae0ee43f274bf22d0c4c 100644 (file)
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m54455evb/u-boot.lds b/board/freescale/m54455evb/u-boot.lds
index 1aa53c23f61f60d261d94c4096a665061c229ffc..bcf30c3532f862a8342628f9e20c02ee58759d69 100644 (file)
--- a/board/freescale/m54455evb/u-boot.lds
+++ b/board/freescale/m54455evb/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds
index cc7f3eba878a88527de586c6fbd709e4939495c6..c25c8dcdc816a8d88394eb1c68fdeb3ff48ee364 100644 (file)
--- a/board/freescale/m547xevb/u-boot.lds
+++ b/board/freescale/m547xevb/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds
index cc7f3eba878a88527de586c6fbd709e4939495c6..c25c8dcdc816a8d88394eb1c68fdeb3ff48ee364 100644 (file)
--- a/board/freescale/m548xevb/u-boot.lds
+++ b/board/freescale/m548xevb/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/freescale/mpc7448hpc2/u-boot.lds b/board/freescale/mpc7448hpc2/u-boot.lds
index 6b228f7a91fc1e41f3af7379b029ff4c4d4d01fa..68110ffd5bc62214d661073cbf3133ebaa8b477f 100644 (file)
--- a/board/freescale/mpc7448hpc2/u-boot.lds
+++ b/board/freescale/mpc7448hpc2/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/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index c379460c9b0eb152f66bdf76ed6b2af361d2edc4..1c35fa614efd63ab72fbe7a9ca76432bd0ae5ce3 100644 (file)
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -44,7 +44,7 @@ SECTIONS
          drivers/mtd/libmtd.a                  (.text)
 
          . = DEFINED(env_offset) ? env_offset : .;
-         common/environment.o(.text)
+         common/env_embedded.o(.text)
 
          *(.text)
        }

diff --git a/board/g2000/u-boot.lds b/board/g2000/u-boot.lds
index d70d37934e4e32457128ac7db6626d71e9aca714..7ff074c152ed5a6369351280009248d6a52b76e6 100644 (file)
--- a/board/g2000/u-boot.lds
+++ b/board/g2000/u-boot.lds
@@ -73,7 +73,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds
index bb03d3aacd34e61e9327aa2bc5a014ed7a7a0b9f..8215a230c7f64a85fd7b3348026be124e98690b1 100644 (file)
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds
@@ -133,6 +133,6 @@ SECTIONS
   .ppcenv:
   {
     . = env_offset;
-    common/environment.o
+    common/env_embedded.o
   }
 }

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 3573608d2b2fa4bab4a27edac09a67c24497d3bf..99d743b5a1259ad9f323b7822b761febb8f341ea 100644 (file)
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.text)
     *(.fixup)
     *(.got1)
@@ -137,7 +137,7 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index 8dedba81470c3360a6f3813db1e7aa4f2acd3081..61fdfe53ec7a2ae27bb5499970a889af412637f5 100644 (file)
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.text)
     *(.fixup)
     *(.got1)
@@ -135,7 +135,7 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds
index 95f94454d0018ccc4337f3746dedc59598529a67..ea5fafe2b4bae60693e82db547987d7199a0a1ff 100644 (file)
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds
@@ -54,7 +54,7 @@ SECTIONS
   {
     cpu/mpc8xx/start.o(.text)
     *(.text)
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.fixup)
     *(.got1)
   }

diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 5f5fb0d58e3fffce2d0ad49f399d2d0ea6868272..47c4c7b16d78e4a4faebef0b6341b124b61619ec 100644 (file)
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/cache.o            (.text)
     lib_generic/crc32.o                (.text)
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index 41d603f7ea194d2c7d305ec00a71a3b2a2aac056..78456e6d8f7867f9d5b958abcb677bdf5a3295b5 100644 (file)
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
     lib_ppc/ticks.o            (.text)
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index cb7b4ea0676c86da16db33d07361cd32fe153bae..2b7e54bf742c4ca8593fae4c860b79d5324388be 100644 (file)
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
 
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)
@@ -140,7 +140,7 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index c33581d25035df5873b5b6c311f0a0380295b16b..ea8538900c0a4802bc67fce9e71e8e91a875c53b 100644 (file)
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/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)

diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index be4bf7278c88cf3afd69118672abe29148584689..5594633d31854a88d09f571e3621d3cf6961314d 100644 (file)
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 */
 
     *(.text)

diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 7a7a40c23eeb6c20f63f4e7b5f8d0afa71817cd6..dbd1f9d1064a7a74778fcbf10f522cece405b479 100644 (file)
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index c07d02383458d92cbb1fbd0f0a61ae59d3a24e29..0bc7fa1ab9e6eccc70d57d3127892c03db48e685 100644 (file)
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index ef88297930d56fa22c7e409cb218f6ae0591d676..8335364251d2920ceaf08abb364bee5cb1ceee55 100644 (file)
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/ticks.o            (.text)
 /**
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 **/
     *(.text)
     *(.fixup)

diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index ad685e6f8d43dacde82eff88273ebaa0732172dc..e8a47f7a0b994c7d4ce21ea76301ebcb4a25350f 100644 (file)
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/ticks.o            (.text)
 /**
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 **/
     *(.text)
     *(.fixup)

diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds
index d7f360f3bbb9f9546543a0d9b27f18ffec568bec..c869e2781f222e0879671fcfd3e350be0a0053af 100644 (file)
--- a/board/ivm/u-boot.lds
+++ b/board/ivm/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)
     *(.got1)

diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index 995fc8327041b208413c5cdd38be1f51612aec33..4d49f1bbef41c9f5566ad5c2360d5dbb5c758751 100644 (file)
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/jse/u-boot.lds b/board/jse/u-boot.lds
index 7e060cbfd0eb536418caca931fff01ca24a648fc..3789db9728dea996ab4f2f7647fb47fade970211 100644 (file)
--- a/board/jse/u-boot.lds
+++ b/board/jse/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/kgdb.o  (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 2e9169c16383ca6d24d54728e385d719ae4f2529..466a8f230dcfb3b263d08a20b2dac5b2c446cc05 100644 (file)
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 */
 
     *(.text)

diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug
index f6d153763981fc768be1982efc2c223a75a796a9..0f6ae696d8a38e9c77f11d865872bd3184abcc4b 100644 (file)
--- a/board/kup/kup4k/u-boot.lds.debug
+++ b/board/kup/kup4k/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)

diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index 2e9169c16383ca6d24d54728e385d719ae4f2529..466a8f230dcfb3b263d08a20b2dac5b2c446cc05 100644 (file)
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 */
 
     *(.text)

diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug
index f6d153763981fc768be1982efc2c223a75a796a9..0f6ae696d8a38e9c77f11d865872bd3184abcc4b 100644 (file)
--- a/board/kup/kup4x/u-boot.lds.debug
+++ b/board/kup/kup4x/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)

diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 2d266434f4eb87703b3278fb108ebfee41917ad1..185a9f8cdabe30d47bbf28d01521969010e24204 100644 (file)
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index 7dc4408c67456b0b0fa307647a639273e02dbb85..d5e2c1d579ba179caf8211812ca37c6445da4537 100644 (file)
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/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)

diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds
index bc1ea73723c6fbb5a4489869622ddf9daef06dda..a513ab500e1d48a6c6af2eac9d7d8c93f78555da 100644 (file)
--- a/board/lwmon/u-boot.lds
+++ b/board/lwmon/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)
     *(.got1)

diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 2ee8237451814c1faa27c59bd9813c7785ab119d..bd9d76ce2067a6cdd77ccb8ffce28d2c4d35c412 100644 (file)
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index fd2245f57ba8de452951c983f02c6a89c315fe21..67d37ae33449e158c434c09896bd55426175a8fd 100644 (file)
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/mgsuvd/u-boot.lds b/board/mgsuvd/u-boot.lds
index 8c46e4677f0bfa9c091ff2957259625f8d4b4196..26aa5d654611f47ed093477ffb6976edec36f16e 100644 (file)
--- a/board/mgsuvd/u-boot.lds
+++ b/board/mgsuvd/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index c9406ad7f05424901521c2ccaa2bd7776d51a182..1182f74002225318f88bdf508b1d2fa9a0010288 100644 (file)
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index 0552994f40ee76ed1308a192894558bbacc634e9..338392a075986f34bf1c231a084488d0ceb8d74e 100644 (file)
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index 46b98a04a87d57eceed72583da529803d4cc70b2..d048e52d35ad481038c8e578811801926574fe63 100644 (file)
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -96,7 +96,7 @@ SECTIONS
 
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   } > ram
 
   _end = . ;

diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 3ba7c3c9a4759a919e18e8f2a2e4fc785a624b31..27d10b6d6a09656738f8bbaf44df365c5d2bc150 100644 (file)
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -60,7 +60,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
                . = env_offset;
-    common/environment.o (.text)
+    common/env_embedded.o (.text)
 
                *(.text)
 

diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds
index 7932b9fc0f25a72faaef9a08096502eb621f6eeb..717f0d24db076ca67605a98d04b466c6dcbea0c2 100644 (file)
--- a/board/mpl/mip405/u-boot.lds
+++ b/board/mpl/mip405/u-boot.lds
@@ -79,7 +79,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/mpl/pip405/u-boot.lds b/board/mpl/pip405/u-boot.lds
index fb710649a5256b537efa4505218a03fe0e46c5c7..dfc233f0d1f53d9dee132beb64b7bdb927a10657 100644 (file)
--- a/board/mpl/pip405/u-boot.lds
+++ b/board/mpl/pip405/u-boot.lds
@@ -74,7 +74,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index 0552994f40ee76ed1308a192894558bbacc634e9..338392a075986f34bf1c231a084488d0ceb8d74e 100644 (file)
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/mpr2/u-boot.lds b/board/mpr2/u-boot.lds
index eda6b442abf42b9ee6256c9a7950e86d63b48828..b1f0e1d6dd6d09d1c249759f16ef0467c383db03 100644 (file)
--- a/board/mpr2/u-boot.lds
+++ b/board/mpr2/u-boot.lds
@@ -53,9 +53,9 @@ SECTIONS
        {
                cpu/sh3/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/ms7720se/u-boot.lds b/board/ms7720se/u-boot.lds
index ba71a9195ee41826575cbd79ec61a7f3e5d4ed59..2156f6a57915cbfb2e62cf43342df4f98a34cd96 100644 (file)
--- a/board/ms7720se/u-boot.lds
+++ b/board/ms7720se/u-boot.lds
@@ -52,9 +52,9 @@ SECTIONS
        {
                cpu/sh3/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/ms7722se/u-boot.lds b/board/ms7722se/u-boot.lds
index 88b4f5c45face33a0bd64a500ffd9a41be244072..7dffe008af0b96ad185584c5f7e142317990497b 100644 (file)
--- a/board/ms7722se/u-boot.lds
+++ b/board/ms7722se/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/ms7750se/u-boot.lds b/board/ms7750se/u-boot.lds
index 88b4f5c45face33a0bd64a500ffd9a41be244072..7dffe008af0b96ad185584c5f7e142317990497b 100644 (file)
--- a/board/ms7750se/u-boot.lds
+++ b/board/ms7750se/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 271102b770c6c7572eafe439c8f5c95eb02ef456..8272a5588d4409d64844bf06ed0fdff725ae2274 100644 (file)
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug
index 5bf1a66286b62d9fd5bc1da18b02e91dc41c245d..d47c4082aa8f9ff9e6ddb60f9834b94217a44ecd 100644 (file)
--- a/board/netphone/u-boot.lds.debug
+++ b/board/netphone/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)

diff --git a/board/netstal/hcu4/u-boot.lds b/board/netstal/hcu4/u-boot.lds
index 3bcfea2a8cf3211ed47df26ef4b706021ae6b0e0..368e3a4d8f0a31c782ab6eeeffc699c0008f0882 100644 (file)
--- a/board/netstal/hcu4/u-boot.lds
+++ b/board/netstal/hcu4/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     cpu/ppc4xx/start.o (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/netstal/mcu25/u-boot.lds b/board/netstal/mcu25/u-boot.lds
index 740bc9c9708ffbadf3a351981097a8c2312ad81c..093c0804cefdf6bc77bb91c794f34477db002fd3 100644 (file)
--- a/board/netstal/mcu25/u-boot.lds
+++ b/board/netstal/mcu25/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
     cpu/ppc4xx/start.o (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index f560189c0bc49897f68ab86cc35a297eed877206..861f6ba28a5f28e76be9ed22a300487c471e7637 100644 (file)
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug
index 5bf1a66286b62d9fd5bc1da18b02e91dc41c245d..d47c4082aa8f9ff9e6ddb60f9834b94217a44ecd 100644 (file)
--- a/board/netta/u-boot.lds.debug
+++ b/board/netta/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)

diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index f560189c0bc49897f68ab86cc35a297eed877206..861f6ba28a5f28e76be9ed22a300487c471e7637 100644 (file)
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug
index 5bf1a66286b62d9fd5bc1da18b02e91dc41c245d..d47c4082aa8f9ff9e6ddb60f9834b94217a44ecd 100644 (file)
--- a/board/netta2/u-boot.lds.debug
+++ b/board/netta2/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)

diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index b4f210e48468755114e7a64db4695c6df7b4f56b..58bd7575e68bc3a55fef1208148b6b4836064158 100644 (file)
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index 1014ec6e8cf6677d2a71bf4f7ab8e2f11dd227f9..9210c43d52d755707daf46f481232685699bb083 100644 (file)
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/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)

diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds
index 85117aa56e3792367794cdec1ebe07f58040b4c6..465566d7abbf45682d3e5bffb1670942e36688b2 100644 (file)
--- a/board/nx823/u-boot.lds
+++ b/board/nx823/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/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index 85072feda47ce32de1b81d1da925745e627ebf41..dbec9860a92a20a0969babd7d912a87e56f7e0ab 100644 (file)
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/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)

diff --git a/board/pcippc2/u-boot.lds b/board/pcippc2/u-boot.lds
index ebb1b6d46a4949ef1e814e2ce6eebb53176f3347..ad41f20c5ed3dbb874884aa26d76fbfa1be316db 100644 (file)
--- a/board/pcippc2/u-boot.lds
+++ b/board/pcippc2/u-boot.lds
@@ -63,7 +63,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/ppmc7xx/u-boot.lds b/board/ppmc7xx/u-boot.lds
index 5239b35af294dcb21ddda32ef496a757a421ec1c..bfa497513e5b312660f817608d30c4863eeccee1 100644 (file)
--- a/board/ppmc7xx/u-boot.lds
+++ b/board/ppmc7xx/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/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds
index 1a95755ab499fffc63b84fd2221e2c9b85529350..b6b37ef34f02117a69ee640faa954d898a2b5a07 100644 (file)
--- a/board/prodrive/p3mx/u-boot.lds
+++ b/board/prodrive/p3mx/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/purple/u-boot.lds b/board/purple/u-boot.lds
index 972e6e7207c9291aa053dbb1d4137c3debc40795..09d6847da6fa17b55270a3c5e2f206f2f406d0b9 100644 (file)
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -42,7 +42,7 @@ SECTIONS
          common/cmd_boot.o             (.text)
          lib_generic/zlib.o            (.text)
          . = DEFINED(env_offset) ? env_offset : .;
-         common/environment.o  (.ppcenv)
+         common/env_embedded.o (.ppcenv)
 
          *(.text)
        }

diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index 1f9a191d4736171bde7b7b1f95a04669613f1e61..271ac766f6d2af48dd039e54d2105da26a756b18 100644 (file)
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
 /* XXX ?
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug
index 0cd053a8bbaa8fba6c740b226feae69a1c7b8bb2..016048dae2a55dce877babda7421d3f1ce5bc736 100644 (file)
--- a/board/quantum/u-boot.lds.debug
+++ b/board/quantum/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)

diff --git a/board/r2dplus/u-boot.lds b/board/r2dplus/u-boot.lds
index 96d8d81acf8d06f4eea0bd84bb6efe3da9b66a97..040e530179bf6d153f09e57c875e376973c2af72 100644 (file)
--- a/board/r2dplus/u-boot.lds
+++ b/board/r2dplus/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds
index 5fcd5c9f1b089304dfc1501fb5b53622b25fd411..88c1b306daa405ff6337fc46dd6285207a44f6a1 100644 (file)
--- a/board/r360mpi/u-boot.lds
+++ b/board/r360mpi/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
 /***
     . = env_offset;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 ***/
     *(.text)
     *(.fixup)
@@ -138,6 +138,6 @@ SECTIONS
   . = ALIGN(128 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
 }

diff --git a/board/r7780mp/u-boot.lds b/board/r7780mp/u-boot.lds
index e7499e5cd98d279e27e0b66fbf7f5cc2ef1301f1..eaa05d0d58cb70b5d1daf37769ce1251a4242d79 100644 (file)
--- a/board/r7780mp/u-boot.lds
+++ b/board/r7780mp/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index e41782554f0e3e1bcd9eae7373a82b1ccc3719a9..8247430e94c3c75843cddc0a769cd77c45d9c6bd 100644 (file)
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index 1f9a191d4736171bde7b7b1f95a04669613f1e61..271ac766f6d2af48dd039e54d2105da26a756b18 100644 (file)
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
 /* XXX ?
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index 0cd053a8bbaa8fba6c740b226feae69a1c7b8bb2..016048dae2a55dce877babda7421d3f1ce5bc736 100644 (file)
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/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)

diff --git a/board/rsk7203/u-boot.lds b/board/rsk7203/u-boot.lds
index bf4433a236d94afdec420be4823b332e7f79d657..63e5b9744efcc2bed0ecaa7b53055fa46fae835d 100644 (file)
--- a/board/rsk7203/u-boot.lds
+++ b/board/rsk7203/u-boot.lds
@@ -46,9 +46,9 @@ SECTIONS
        {
                cpu/sh2/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds
index 216f9c64dc6ed59553b83148df95cf152e0ab7a5..9b2c0788f6fa1ef2699a5687e3107184f86c52e4 100644 (file)
--- a/board/sandburst/karef/u-boot.lds
+++ b/board/sandburst/karef/u-boot.lds
@@ -81,7 +81,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index af7d5c08aadfbe76bfbf2dfac947decdd7bfc6b1..15fe1e3f8b978106b49ec0bd4518aa91abc5a580 100644 (file)
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -70,7 +70,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
     lib_generic/zlib.o         (.text)
 
-/*    common/environment.o(.text) */
+/*    common/env_embedded.o(.text) */
 
     *(.text)
     *(.fixup)

diff --git a/board/sandburst/metrobox/u-boot.lds b/board/sandburst/metrobox/u-boot.lds
index 6abf3f390a83d75813cb76b31d78290ec52dac3b..16e0709b5d107dbf2e2948bbc5d1e4a454e869fb 100644 (file)
--- a/board/sandburst/metrobox/u-boot.lds
+++ b/board/sandburst/metrobox/u-boot.lds
@@ -81,7 +81,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index 527c264326e0f69092b71bba86375276c4f0ee08..d122c050b015b5f5aa02bf7702211a1e387d3cd9 100644 (file)
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -70,7 +70,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
     lib_generic/zlib.o         (.text)
 
-/*    common/environment.o(.text) */
+/*    common/env_embedded.o(.text) */
 
     *(.text)
     *(.fixup)

diff --git a/board/sbc405/u-boot.lds b/board/sbc405/u-boot.lds
index 7b1c6b211d5b288d6ec938617bce7a8949e702f2..f3fd56f99cf8730f8c4f6cbdc1b41a33aa842ec3 100644 (file)
--- a/board/sbc405/u-boot.lds
+++ b/board/sbc405/u-boot.lds
@@ -73,7 +73,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index 27cc0b928cca359bbf89479880226b43293e4e52..c67aa96c702e6fcc8ab3f55be1bff4c14191540f 100644 (file)
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -74,7 +74,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/sh7763rdp/u-boot.lds b/board/sh7763rdp/u-boot.lds
index c07f0d80ed01bd2a179c7bafb6b176f1c96eefe6..7177416c2fce3b19d2817256d684e7b239b92c04 100644 (file)
--- a/board/sh7763rdp/u-boot.lds
+++ b/board/sh7763rdp/u-boot.lds
@@ -49,9 +49,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/sh7785lcr/u-boot.lds b/board/sh7785lcr/u-boot.lds
index f0109eb24f419f46a52308054776103d1aaa4f5b..8dcc6c7b1bf9d7e8e34fcab07afafc0c25d3f449 100644 (file)
--- a/board/sh7785lcr/u-boot.lds
+++ b/board/sh7785lcr/u-boot.lds
@@ -40,9 +40,9 @@ SECTIONS
        {
                cpu/sh4/start.o         (.text)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenv)
+               common/env_embedded.o   (.ppcenv)
                . = ALIGN(8192);
-               common/environment.o    (.ppcenvr)
+               common/env_embedded.o   (.ppcenvr)
                . = ALIGN(8192);
                *(.text)
                . = ALIGN(4);

diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 10b38ec356c24615d673e7586642c6ed30b4f388..2229f61a4bbd8dcbb65487a633ba54ecbdabd700 100644 (file)
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index bf639919768b8db1e3a45630c8ce6d4ce75548e4..88dbd3810ffb082cf24a9ac75d0f7bcf18623022 100644 (file)
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/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)

diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 291f6b368439baf818963f12f586150e6d511b51..7a0d746d749e56dc363b3daeb1e0e6db40012db2 100644 (file)
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     cpu/mpc8xx/interrupts.o (.text)
     lib_ppc/time.o             (.text)
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/siemens/pcu_e/u-boot.lds b/board/siemens/pcu_e/u-boot.lds
index bc1ea73723c6fbb5a4489869622ddf9daef06dda..a513ab500e1d48a6c6af2eac9d7d8c93f78555da 100644 (file)
--- a/board/siemens/pcu_e/u-boot.lds
+++ b/board/siemens/pcu_e/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)
     *(.got1)

diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index 2ee8237451814c1faa27c59bd9813c7785ab119d..bd9d76ce2067a6cdd77ccb8ffce28d2c4d35c412 100644 (file)
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds
index b91c44a57d2906176a5762c2c9ddf51bae83cbc1..974e45cabfd69490f7cf416c6627c3d40fc50abe 100644 (file)
--- a/board/sixnet/u-boot.lds
+++ b/board/sixnet/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)
     *(.got1)

diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 2410d5f2c383bf93c4e715e931c6ae175319da92..f1de08b9ea3a85a4fbe9f0fe17fcb0171823c9d5 100644 (file)
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
        lib_ppc/time.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-       common/environment.o    (.ppcenv)
+       common/env_embedded.o   (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index 2410d5f2c383bf93c4e715e931c6ae175319da92..f1de08b9ea3a85a4fbe9f0fe17fcb0171823c9d5 100644 (file)
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
        lib_ppc/time.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-       common/environment.o    (.ppcenv)
+       common/env_embedded.o   (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index 8c46e4677f0bfa9c091ff2957259625f8d4b4196..26aa5d654611f47ed093477ffb6976edec36f16e 100644 (file)
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index 13b29084f1820b010060dcadb89fc6945627f161..6a65b4f555cf928996ffaa9e8f93c7a5c1be17ff 100644 (file)
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/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)
     *(.got1)

diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index fd2245f57ba8de452951c983f02c6a89c315fe21..67d37ae33449e158c434c09896bd55426175a8fd 100644 (file)
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/stxxtc/u-boot.lds b/board/stxxtc/u-boot.lds
index f560189c0bc49897f68ab86cc35a297eed877206..861f6ba28a5f28e76be9ed22a300487c471e7637 100644 (file)
--- a/board/stxxtc/u-boot.lds
+++ b/board/stxxtc/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/stxxtc/u-boot.lds.debug b/board/stxxtc/u-boot.lds.debug
index 5bf1a66286b62d9fd5bc1da18b02e91dc41c245d..d47c4082aa8f9ff9e6ddb60f9834b94217a44ecd 100644 (file)
--- a/board/stxxtc/u-boot.lds.debug
+++ b/board/stxxtc/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)

diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 14ff179879b6fdad637a2e351a2810b4b9f3929e..d4fe7188058492cedcc8d0cf885266ea20167dfa 100644 (file)
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = env_offset;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index 0cd053a8bbaa8fba6c740b226feae69a1c7b8bb2..016048dae2a55dce877babda7421d3f1ce5bc736 100644 (file)
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/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)

diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index 8c46e4677f0bfa9c091ff2957259625f8d4b4196..26aa5d654611f47ed093477ffb6976edec36f16e 100644 (file)
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug
index c33581d25035df5873b5b6c311f0a0380295b16b..ea8538900c0a4802bc67fce9e71e8e91a875c53b 100644 (file)
--- a/board/tqc/tqm8xx/u-boot.lds.debug
+++ b/board/tqc/tqm8xx/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)

diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index 043e01c9b3696187dd17277ea9dd5e2a7575151b..45a4410135c7634c058a90cae2558724391f0106 100644 (file)
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -39,7 +39,7 @@ SECTIONS
          lib_generic/string.o  (.text)
 
        . = DEFINED(env_offset) ? env_offset : .;
-         common/environment.o  (.ppcenv)
+         common/env_embedded.o (.ppcenv)
 
          *(.text)
        }

diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index db2934249168d020c0583d4bab200d869cf2cbfa..c69fe474ae2ca3be94696240fead371fef11a2c1 100644 (file)
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     lib_ppc/cache.o            (.text)
     lib_ppc/time.o             (.text)
 
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug
index 25702a543ca6f1ea820ee69ce4bf89c174503ce8..5750657111fb6e726ec228cfb1fe951db9bd0ad3 100644 (file)
--- a/board/uc100/u-boot.lds.debug
+++ b/board/uc100/u-boot.lds.debug
@@ -60,7 +60,7 @@ SECTIONS
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 7bcf061555f915b05bd7813c2841b1c3148977bd..f4ea41e0fc2bed1d6d4f23b7a818e72e674d0e74 100644 (file)
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -68,7 +68,7 @@ SECTIONS
 /*
     . = env_offset;
 */
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index d3ffed300a941967638c3aa8c6922fb47d60482c..d2089de9d4fa0b4ef5bc252ce6fe1cd1e622c23f 100644 (file)
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 10b38ec356c24615d673e7586642c6ed30b4f388..2229f61a4bbd8dcbb65487a633ba54ecbdabd700 100644 (file)
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 7a7a40c23eeb6c20f63f4e7b5f8d0afa71817cd6..dbd1f9d1064a7a74778fcbf10f522cece405b479 100644 (file)
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds
index 2d32225d4f6079e5769b78a102dcacb85b2b2fc3..f05c7a61ea9615aa989378b2c37d505e53139cc2 100644 (file)
--- a/board/xilinx/ml300/u-boot.lds
+++ b/board/xilinx/ml300/u-boot.lds
@@ -71,7 +71,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 */
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug
index 0552994f40ee76ed1308a192894558bbacc634e9..338392a075986f34bf1c231a084488d0ceb8d74e 100644 (file)
--- a/board/xilinx/ml300/u-boot.lds.debug
+++ b/board/xilinx/ml300/u-boot.lds.debug
@@ -61,7 +61,7 @@ SECTIONS
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)

diff --git a/board/xpedite1k/u-boot.lds b/board/xpedite1k/u-boot.lds
index 70b1e38f3c3e93cf9647e801d8137cd582b3b94a..c365c6f8315cb2956d58f095a92a344b6ff39de2 100644 (file)
--- a/board/xpedite1k/u-boot.lds
+++ b/board/xpedite1k/u-boot.lds
@@ -79,7 +79,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)

diff --git a/board/xpedite1k/u-boot.lds.debug b/board/xpedite1k/u-boot.lds.debug
index e0da854a4ddad786e0f030f288cfc876e6c040ac..116c2ba6a7130d044374fb320b55f1114ac51b51 100644 (file)
--- a/board/xpedite1k/u-boot.lds.debug
+++ b/board/xpedite1k/u-boot.lds.debug
@@ -68,7 +68,7 @@ SECTIONS
     lib_ppc/extable.o  (.text)
     lib_generic/zlib.o         (.text)
 
-/*    common/environment.o(.text) */
+/*    common/env_embedded.o(.text) */
 
     *(.text)
     *(.fixup)

diff --git a/common/Makefile b/common/Makefile
index cf861c575c1e90eabcfc2043361005f9685406e2..fad9bc1b614d989f04f76e080c1c46174510fd07 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -48,10 +48,10 @@ COBJS-y += cmd_bootm.o
 COBJS-y += cmd_nvedit.o
 
 # environment
-COBJS-y += environment.o
 COBJS-y += env_common.o
 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
+COBJS-y += env_embedded.o
 COBJS-y += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
@@ -167,10 +167,10 @@ all:      $(LIB) $(AOBJS)
 $(LIB): $(obj).depend $(OBJS)
        $(AR) $(ARFLAGS) $@ $(OBJS)
 
-$(obj)environment.o: $(src)environment.c $(obj)../tools/envcrc
+$(obj)env_embedded.o: $(src)env_embedded.c $(obj)../tools/envcrc
        $(CC) $(AFLAGS) -Wa,--no-warn \
                -DENV_CRC=$(shell $(obj)../tools/envcrc) \
-               -c -o $@ $(src)environment.c
+               -c -o $@ $(src)env_embedded.c
 
 $(obj)../tools/envcrc:
        $(MAKE) -C ../tools

diff --git a/common/environment.c b/common/env_embedded.c
similarity index 100%
rename from common/environment.c
rename to common/env_embedded.c

diff --git a/cpu/mpc5xx/u-boot.lds b/cpu/mpc5xx/u-boot.lds
index 7434e3fb621dcf9f3d6b5efad7dac2ace92840db..c83f155197615146933890eb2617a7d44a2aa8bd 100644 (file)
--- a/cpu/mpc5xx/u-boot.lds
+++ b/cpu/mpc5xx/u-boot.lds
@@ -133,7 +133,7 @@ SECTIONS
 /*   . = env_start;
        .ppcenv :
        {
-               common/environment.o (.ppcenv)
+               common/env_embedded.o (.ppcenv)
        }
 */
 }

diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index 38478601ab46fa3f2a6f08f2a709e365b322bd8c..df8eb7e0a57538116f8ea900e9e9fb5f3970a47c 100644 (file)
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -62,7 +62,7 @@ SECTIONS
     lib_ppc/time.o              (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o        (.ppcenv)
+    common/env_embedded.o        (.ppcenv)
 
     *(.text)
     *(.fixup)

diff --git a/doc/README.nios b/doc/README.nios
index 671e7277fa93cfc015ff0bb9de62ed5be980d260..2f1148975ae061afb10c1b1a5ef5de67a1a0df6f 100644 (file)
--- a/doc/README.nios
+++ b/doc/README.nios
@@ -325,16 +325,16 @@ For developers using the Altera cygwin tools you can remove the
 also have to edit common/Makefile:
 
 Replace:
-environment.o: environment.c ../tools/envcrc
+env_embedded.o: env_embedded.c ../tools/envcrc
        $(CC) $(AFLAGS) -Wa,--no-warn \
                -DENV_CRC=$(shell ../tools/envcrc) \
-               -c -o $@ environment.c
+               -c -o $@ env_embedded.c
 
 With:
-environment.o: environment.c
+env_embedded.o: env_embedded.c
        $(CC) $(AFLAGS) -Wa,--no-warn \
                -DENV_CRC=0 \
-               -c -o $@ environment.c
+               -c -o $@ env_embedded.c
 
 BTW, thats a 'zero' ... not the letter 'O'. And not that the
 "../tools/envcrc" dependency is removed.

diff --git a/tools/.gitignore b/tools/.gitignore
index 157b6790e1a411e01e4c86f6c2b0d383693d4134..377ca9aaa88d8f85f5ad4437c386679c7ff813b9 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,7 +1,7 @@
 /bmp_logo
 /crc32.c
 /envcrc
-/environment.c
+/env_embedded.c
 /gen_eth_addr
 /img2srec
 /md5.c

diff --git a/tools/Makefile b/tools/Makefile
index 21ea1c204f45a7c2e64ccabb8f78fcc529f3e43f..9e9ee15fb87dc4f94ec1e24fa4d83c8b3ba5e1a1 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -23,7 +23,7 @@
 
 BIN_FILES      = img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX)
 
-OBJ_LINKS      = environment.o crc32.o md5.o sha1.o image.o
+OBJ_LINKS      = env_embedded.o crc32.o md5.o sha1.o image.o
 OBJ_FILES      = img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o
 
 ifeq ($(ARCH),mips)
@@ -137,7 +137,7 @@ MAKEDEPEND = makedepend
 
 all:   $(obj).depend $(BINS) $(LOGO_H) subdirs
 
-$(obj)envcrc$(SFX):    $(obj)envcrc.o $(obj)crc32.o $(obj)environment.o $(obj)sha1.o
+$(obj)envcrc$(SFX):    $(obj)envcrc.o $(obj)crc32.o $(obj)env_embedded.o $(obj)sha1.o
                $(CC) $(CFLAGS) -o $@ $^
 
 $(obj)ubsha1$(SFX):    $(obj)ubsha1.o $(obj)sha1.o
@@ -237,11 +237,11 @@ else
                done
 endif
 
-$(obj)environment.c:
-               @rm -f $(obj)environment.c
-               ln -s $(src)../common/environment.c $(obj)environment.c
+$(obj)env_embedded.c:
+               @rm -f $(obj)env_embedded.c
+               ln -s $(src)../common/env_embedded.c $(obj)env_embedded.c
 
-$(obj)environment.o:   $(obj)environment.c
+$(obj)env_embedded.o:  $(obj)env_embedded.c
                $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 $(obj)zlib.h: