Merge branch 'fixes' into cleanups

[u-boot] / board / esd / canbt / u-boot.lds

diff --git a/board/esd/canbt/u-boot.lds b/board/esd/canbt/u-boot.lds
index e66db5d233ad9657a67f43e86ddd7063578613e0..74280e61d4881ad6615b7944a57f9a465305feef 100644 (file)
--- a/board/esd/canbt/u-boot.lds
+++ b/board/esd/canbt/u-boot.lds
@@ -78,12 +78,11 @@ SECTIONS
     common/cmd_mem.o           (.text)
     common/cmd_nvedit.o                (.text)
     common/console.o           (.text)
-    common/lists.o             (.text)
     common/main.o              (.text)
     net/net.o                  (.text)
 
 /*    . = env_offset;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 */
 
     *(.text)
@@ -155,6 +154,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);