Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / board / genietv / u-boot.lds.debug

diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index 8dedba81470c3360a6f3813db1e7aa4f2acd3081..a3aeb604cc36af720aa8936c764d7c6f4e25fe9d 100644 (file)
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -55,17 +55,16 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
-    cpu/mpc8xx/start.o (.text)
+    arch/powerpc/cpu/mpc8xx/start.o    (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    arch/powerpc/lib/ppcstring.o       (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
@@ -108,9 +107,11 @@ SECTIONS
   _edata  =  .;
   PROVIDE (edata = .);
 
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
+
+  . = ALIGN(4);
+  .u_boot_list : {
+       KEEP(*(SORT(.u_boot_list*)));
+  }
 
 
   __start___ex_table = .;
@@ -135,8 +136,8 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
-  _end = . ;
+  __bss_end__ = . ;
   PROVIDE (end = .);
 }