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

[u-boot] / board / atmel / atstk1000 / u-boot.lds

diff --git a/board/atmel/atstk1000/u-boot.lds b/board/atmel/atstk1000/u-boot.lds
index 0d3b19c6402cb4ecff494b00c4a4424bc806ad99..0e532f234e4c3d0a0350dba456433d308fb66c9d 100644 (file)
--- a/board/atmel/atstk1000/u-boot.lds
+++ b/board/atmel/atstk1000/u-boot.lds
@@ -36,8 +36,7 @@ SECTIONS
        _etext = .;
 
        .rodata : {
-               *(.rodata)
-               *(.rodata.*)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
 
        . = ALIGN(8);
@@ -69,5 +68,5 @@ SECTIONS
                *(.bss.*)
        }
        . = ALIGN(8);
-       _end = .;
+       __bss_end__ = .;
 }