Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / board / kup / kup4k / u-boot.lds

diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 2e9169c16383ca6d24d54728e385d719ae4f2529..120ca00fddf152a2b589a8b9874f56ad9dbef82c 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)
@@ -137,6 +137,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);