Merge branch 'next'

[karo-tx-uboot.git] / board / icu862 / u-boot.lds.debug

diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index dbd1f9d1064a7a74778fcbf10f522cece405b479..3e075a85bd14f27342f838ceeb0a8aebb2288b44 100644 (file)
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/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_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    arch/powerpc/lib/extable.o (.text)
 
     . = env_offset;
     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 : {
+       #include <u-boot.lst>
+  }
 
 
   __start___ex_table = .;
@@ -132,6 +133,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
   }
-  _end = . ;
+  __bss_end__ = . ;
   PROVIDE (end = .);
 }