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

[u-boot] / board / pb1x00 / u-boot.lds

diff --git a/board/pb1x00/u-boot.lds b/board/pb1x00/u-boot.lds
index 1e1c5590d77a6fed6185fbe0cb514b24f0e6d3cf..9a6cd1b8a3eb912be484d1a5a54fa6f28bc97ee9 100644 (file)
--- a/board/pb1x00/u-boot.lds
+++ b/board/pb1x00/u-boot.lds
@@ -38,7 +38,7 @@ SECTIONS
        }
 
        . = ALIGN(4);
-       .rodata  : { *(.rodata) }
+       .rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data  : { *(.data) }
@@ -65,6 +65,6 @@ SECTIONS
 
        . = ALIGN(4);
        .sbss (NOLOAD)  : { *(.sbss) }
-       .bss (NOLOAD)  : { *(.bss) }
+       .bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
        uboot_end = .;
 }