Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / samsung / smdk5250 / smdk5250-uboot-spl.lds

diff --git a/board/samsung/smdk5250/smdk5250-uboot-spl.lds b/board/samsung/smdk5250/smdk5250-uboot-spl.lds
index 951d8cec1d84eb4c9d0eb2eb2134f64b1fdc7f41..7df0a1d3f82a202292c5413d6f27ac9d0d2564c5 100644 (file)
--- a/board/samsung/smdk5250/smdk5250-uboot-spl.lds
+++ b/board/samsung/smdk5250/smdk5250-uboot-spl.lds
@@ -37,7 +37,7 @@ SECTIONS
        .text :
        {
                __start = .;
-               arch/arm/cpu/armv7/start.o (.text)
+               arch/arm/cpu/armv7/start.o (.text*)
                *(.text*)
        } >.sram
        . = ALIGN(4);
@@ -49,7 +49,7 @@ SECTIONS
        . = ALIGN(4);
 
        .u_boot_list : {
-               #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        } >.sram
        . = ALIGN(4);
 
@@ -66,6 +66,6 @@ SECTIONS
                __bss_start = .;
                *(.bss*)
                . = ALIGN(4);
-               __bss_end__ = .;
+               __bss_end = .;
        } >.sram
 }