Merge branch 'next' of git://www.denx.de/git/u-boot-cfi-flash into next

[u-boot] / board / freescale / m5271evb / u-boot.lds

diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index c07d02383458d92cbb1fbd0f0a61ae59d3a24e29..00c1f2a52e09ec1f4ed1cbd3dcfb2e62499459de 100644 (file)
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.text)
     *(.fixup)
@@ -73,8 +73,7 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }