Rename lib_generic/ to lib/

[people/ms/u-boot.git] / board / LEOX / elpt860 / u-boot.lds

diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index 214752d9c0dd1caf731af7fa0aa87ed26837dbd3..d3929ea89f1ceb5bb87e189138fb644e4c3ab4d2 100644 (file)
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -31,7 +31,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
@@ -67,31 +66,28 @@ SECTIONS
 
     cpu/mpc8xx/start.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_generic/string.o               (.text)
-    lib_ppc/cache.o                    (.text)
-    lib_ppc/extable.o                  (.text)
-    lib_ppc/time.o                     (.text)
-    lib_ppc/ticks.o                    (.text)
+    arch/ppc/lib/ppcstring.o                   (.text)
+    lib/vsprintf.o             (.text)
+    lib/crc32.o                        (.text)
+    lib/zlib.o                 (.text)
+    lib/string.o               (.text)
+    arch/ppc/lib/cache.o                       (.text)
+    arch/ppc/lib/extable.o                     (.text)
+    arch/ppc/lib/time.o                        (.text)
+    arch/ppc/lib/ticks.o                       (.text)
 
     . = 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)   }
@@ -142,12 +138,13 @@ SECTIONS
   __init_end = .;
 
   __bss_start = .;
-  .bss       :
+  .bss (NOLOAD)       :
   {
    *(.sbss) *(.scommon)
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);