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

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

diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index fc8fe6cec2b571e93ff8c11cde1e8601cd7fe4c1..ecc9f26e08f0fd2c5b8ad688459c139477da0713 100644 (file)
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -55,11 +55,11 @@ 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/ppc/lib/ppcstring.o   (.text)
-    cpu/mpc8xx/interrupts.o (.text)
-    arch/ppc/lib/time.o                (.text)
-    arch/ppc/lib/ticks.o               (.text)
+    arch/powerpc/cpu/mpc8xx/start.o    (.text)
+    arch/powerpc/lib/ppcstring.o       (.text)
+    arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+    arch/powerpc/lib/time.o            (.text)
+    arch/powerpc/lib/ticks.o           (.text)
 /**
     . = env_offset;
     common/env_embedded.o(.text)
@@ -107,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 = .;
@@ -131,6 +133,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
   }
-  _end = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }