Switch from archive libraries to partial linking

[oweals/u-boot.git] / board / freescale / m5275evb / u-boot.lds

diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds
index 43d65001b39b3131311da188f352fd2c112d0f1e..cd17b0abf268055fdf26a4d13c19697e8f46664c 100644 (file)
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -22,7 +22,6 @@
  */
 
 OUTPUT_ARCH(m68k)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 SECTIONS
@@ -50,19 +49,19 @@ SECTIONS
   .rel.plt       : { *(.rel.plt)       }
   .rela.plt      : { *(.rela.plt)      }
   .init          : { *(.init)          }
-  .plt           : { *(.plt)           }
+  .plt           : { *(.plt)           }
   .text      :
   {
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
-    cpu/mcf52x2/start.o                (.text)
+    arch/m68k/cpu/mcf52x2/start.o              (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/string.o       (.text)
-    lib_generic/zlib.o         (.text)
+    lib/string.o       (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)
@@ -72,8 +71,7 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }