Rename lib_generic/ to lib/

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

diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index ea39cd91215458cbb511aca354e92acf3a208973..ff11ad0f69ad06580777b41e76747faa8cda55d8 100644 (file)
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -28,15 +28,15 @@ SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = + SIZEOF_HEADERS;
-  .interp              : { *(.interp)          }
+  .interp      : { *(.interp)          }
   .hash         : { *(.hash)           }
   .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)       }
@@ -49,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)
     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 = .);