Merge 'next' branch

[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..bf3f534607c42d7d89182e349b70c0175c5588e5 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)