Rename lib_generic/ to lib/

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

diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index b4f210e48468755114e7a64db4695c6df7b4f56b..70d5a6a0dfb88670623cdfc0ad9d93b35100a962 100644 (file)
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -55,28 +55,25 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     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)   }
@@ -134,6 +131,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);