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

[u-boot] / nand_spl / board / samsung / smdk6400 / u-boot.lds

diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds b/nand_spl/board/samsung/smdk6400/u-boot.lds
index 2ed646630c9b31bb0aa793cc9bae1c81c1de35ca..b6c573be5c32acf57648d0f4d63f76d366d7f84a 100644 (file)
--- a/nand_spl/board/samsung/smdk6400/u-boot.lds
+++ b/nand_spl/board/samsung/smdk6400/u-boot.lds
@@ -53,7 +53,7 @@ SECTIONS
 
        . = ALIGN(4);
        .u_boot_list : {
-       #include <u-boot.lst>
+       *(SORT(.u_boot_list*));
        }
 
        . = ALIGN(4);
@@ -75,6 +75,6 @@ SECTIONS
        __bss_start = .;
        *(.bss)
        . = ALIGN(4);
-       __bss_end__ = .;
+       __bss_end = .;
        }
 }