Rename lib_generic/ to lib/

[pandora-u-boot.git] / board / spc1920 / u-boot.lds

diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index 26aa5d6..f95f695 100644 (file)
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -58,28 +58,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/env_embedded.o      (.ppcenv)
 
     *(.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)   }
@@ -137,6 +134,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);