Refactor linker-generated arrays

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

diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index 38012069319476ed6756e2615bafe5aca17f4949..4383c492c3bf5b31577292ec80199e6973f7778d 100644 (file)
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/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)
-    lib_ppc/ppcstring.o        (.text)
-    cpu/mpc8xx/interrupts.o (.text)
-    lib_ppc/time.o             (.text)
-    lib_ppc/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)
 
@@ -106,9 +106,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 = .;
@@ -130,6 +132,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
   }
-  _end = . ;
+  __bss_end__ = . ;
   PROVIDE (end = .);
 }