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

[u-boot] / board / xilinx / microblaze-generic / u-boot.lds

diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds
index b38f64877255d0c02d8b46745b9fc7b09467dea1..ee41145bb584f15b0d6902ee8b903c62057f4b7e 100644 (file)
--- a/board/xilinx/microblaze-generic/u-boot.lds
+++ b/board/xilinx/microblaze-generic/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
        .text ALIGN(0x4):
        {
                __text_start = .;
-               cpu/microblaze/start.o (.text)
+               arch/microblaze/cpu/start.o (.text)
                *(.text)
                __text_end = .;
        }
@@ -38,7 +38,7 @@ SECTIONS
        .rodata ALIGN(0x4):
        {
                __rodata_start = .;
-               *(.rodata)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
                __rodata_end = .;
        }
 
@@ -60,7 +60,10 @@ SECTIONS
        .bss ALIGN(0x4):
        {
                __bss_start = .;
+               *(.sbss)
+               *(.scommon)
                *(.bss)
+               *(COMMON)
                . = ALIGN(4);
                __bss_end = .;
        }