Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index dc531418c363b27b2e19c3a81503d06df585c3c5..445566b3681b0502819105e47ee6bb353b28217c 100644 (file)
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
-    cpu/mcf532x/start.o                (.text)
-    cpu/mcf532x/libmcf532x.a   (.text)
-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/cpu/mcf532x/start.o              (.text)
+    arch/m68k/cpu/mcf532x/libmcf532x.o (.text)
+    arch/m68k/lib/libm68k.o            (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
@@ -72,8 +72,7 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -138,6 +137,6 @@ SECTIONS
    . = ALIGN(4);
    _ebss = .;
   }
-  _end = . ;
+  __bss_end__ = . ;
   PROVIDE (end = .);
 }