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

[u-boot] / arch / arm / cpu / arm920t / ep93xx / u-boot.lds

diff --git a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
index 008ae891cafd8e47b8dc44ad9fc4b0918f37cdb1..e483820f3f93b0ab02cc8bfc86daf5f97b11986b 100644 (file)
--- a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
+++ b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
@@ -51,13 +51,13 @@ SECTIONS
 
        . = ALIGN(4);
        .u_boot_list : {
-       #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        . = ALIGN(4);
        __bss_start = .;
        .bss : { *(.bss) }
-       __bss_end__ = .;
+       __bss_end = .;
 
        _end = .;
 }