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 9f2901c..d6e2404 100644 (file)
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -22,7 +22,6 @@
  */
 
 OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 SECTIONS
@@ -34,10 +33,10 @@ SECTIONS
   .dynsym       : { *(.dynsym)         }
   .dynstr       : { *(.dynstr)         }
   .rel.text     : { *(.rel.text)       }
-  .rela.text    : { *(.rela.text)      }
+  .rela.text    : { *(.rela.text)      }
   .rel.data     : { *(.rel.data)       }
-  .rela.data    : { *(.rela.data)      }
-  .rel.rodata   : { *(.rel.rodata)     }
+  .rela.data    : { *(.rela.data)      }
+  .rel.rodata   : { *(.rel.rodata)     }
   .rela.rodata  : { *(.rela.rodata)    }
   .rel.got      : { *(.rel.got)                }
   .rela.got     : { *(.rela.got)       }
@@ -50,34 +49,31 @@ SECTIONS
   .rel.plt      : { *(.rel.plt)                }
   .rela.plt     : { *(.rela.plt)       }
   .init         : { *(.init)           }
-  .plt                 : { *(.plt)             }
-  .text        :
+  .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/environment.o       (.text)
+    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)   }
@@ -129,12 +125,13 @@ SECTIONS
   __init_end = .;
 
   __bss_start = .;
-  .bss       :
+  .bss (NOLOAD)       :
   {
    *(.sbss) *(.scommon)
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);