Merge branch 'fixes' into cleanups

[oweals/u-boot.git] / board / nx823 / u-boot.lds

diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds
index 85117aa56e3792367794cdec1ebe07f58040b4c6..759b41290588577b24af1d4ea6213dd903cb6b1c 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)
@@ -124,6 +124,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);