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

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

diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index d122c050b015b5f5aa02bf7702211a1e387d3cd9..412af14f569e9bd581bbf1112f1d5d900bd1e4ee 100644 (file)
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -56,24 +56,23 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
-    cpu/ppc4xx/start.o (.text)
+    arch/powerpc/cpu/ppc4xx/start.o    (.text)
     board/sandburst/metrobox/init.o (.text)
-    cpu/ppc4xx/kgdb.o  (.text)
-    cpu/ppc4xx/traps.o (.text)
-    cpu/ppc4xx/interrupts.o    (.text)
-    cpu/ppc4xx/4xx_uart.o      (.text)
-    cpu/ppc4xx/cpu_init.o      (.text)
-    cpu/ppc4xx/speed.o (.text)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    arch/powerpc/cpu/ppc4xx/kgdb.o     (.text)
+    arch/powerpc/cpu/ppc4xx/traps.o    (.text)
+    arch/powerpc/cpu/ppc4xx/interrupts.o       (.text)
+    arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+    arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+    arch/powerpc/cpu/ppc4xx/speed.o    (.text)
+    drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
-    lib_generic/zlib.o         (.text)
+    lib/crc32.o                (.text)
+    arch/powerpc/lib/extable.o (.text)
+    lib/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
@@ -116,9 +115,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 = .;
@@ -140,6 +141,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
   }
-  _end = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }