Merge branch 'master' into next

[karo-tx-uboot.git] / board / mpr2 / u-boot.lds

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);