ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

[kernel/u-boot.git] / board / netphone / u-boot.lds

diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 8836560..d6e2404 100644 (file)
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -52,31 +52,28 @@ SECTIONS
   .plt         : { *(.plt)             }
   .text        :
   {
-    cpu/mpc8xx/start.o         (.text)
-    cpu/mpc8xx/traps.o         (.text)
+    arch/ppc/cpu/mpc8xx/start.o                (.text)
+    arch/ppc/cpu/mpc8xx/traps.o                (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/ppcstring.o           (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? 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)   }