Merge branch 'next' of ../next

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

diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index c379460c9b0eb152f66bdf76ed6b2af361d2edc4..079184e65003ff692569e77f55c76808af4264e4 100644 (file)
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -44,13 +44,13 @@ SECTIONS
          drivers/mtd/libmtd.a                  (.text)
 
          . = DEFINED(env_offset) ? env_offset : .;
-         common/environment.o(.text)
+         common/env_embedded.o(.text)
 
          *(.text)
        }
 
        . = ALIGN(4);
-       .rodata : { *(.rodata) }
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data : { *(.data) }
@@ -65,6 +65,6 @@ SECTIONS
 
        . = ALIGN(4);
        __bss_start = .;
-       .bss : { *(.bss) }
+       .bss : { *(.bss) . = ALIGN(4); }
        _end = .;
 }