Move arch/ppc to arch/powerpc

[karo-tx-uboot.git] / board / amirix / ap1000 / u-boot.lds

diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index 27a6f8b0657499a8a3c14b6870d7a8dfb0a98ad8..bebcded619431371af49b5f331651717ccaff6e1 100644 (file)
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -55,34 +55,31 @@ 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/amirix/ap1000/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)
+    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)
     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)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }