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

[oweals/u-boot.git] / board / sc520_spunk / u-boot.lds

diff --git a/board/sc520_spunk/u-boot.lds b/board/sc520_spunk/u-boot.lds
index 33480d3286411b1584c1925fb32986d405fe11a3..efb570b44b5b9b008f56a166236c1e03538eb0a5 100644 (file)
--- a/board/sc520_spunk/u-boot.lds
+++ b/board/sc520_spunk/u-boot.lds
@@ -32,7 +32,7 @@ SECTIONS
        .text  : { *(.text); }
 
        . = ALIGN(4);
-       .rodata : { *(.rodata) }
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = 0x400000;                       /* Ram data segment to use */
        _i386boot_romdata_dest = ABSOLUTE(.);
@@ -46,7 +46,7 @@ SECTIONS
 
        . = ALIGN(4);
        _i386boot_bss_start = ABSOLUTE(.);
-       .bss (NOLOAD) : { *(.bss) }
+       .bss (NOLOAD) : { *(.bss) . = ALIGN(4); }
        _i386boot_bss_size = SIZEOF(.bss);
 
 
@@ -76,7 +76,7 @@ SECTIONS
         * The fe00 and ff00 offsets of the start32 and start16
         * segments are arbitrary, the just have to be mapped
         * at reset and the code have to fit.
-        * The fff0 offset of reset is important, however.
+        * The fff0 offset of resetvec is important, however.
         */
 
 
@@ -87,6 +87,6 @@ SECTIONS
        .start16 : AT (0x387fff00) { *(.start16); }
 
        . = 0xfff0;
-       .reset : AT (0x387ffff0) { *(.reset); }
-       _i386boot_end = (LOADADDR(.reset) + SIZEOF(.reset) );
+       .resetvec : AT (0x387ffff0) { *(.resetvec); }
+       _i386boot_end = (LOADADDR(.resetvec) + SIZEOF(.resetvec) );
 }