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

[u-boot] / board / actux1 / u-boot.lds

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 572bcea5d01eaa1feb60f779c0bae2b27c0ff9f9..c76728a7fbd3ff9cf06787bf205be4cb32f3fa78 100644 (file)
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
        . = ALIGN(4);
        .u_boot_list : {
-       #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        . = ALIGN (4);
@@ -81,10 +81,10 @@ SECTIONS
        .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-                ___bssend___ = .;
+                __bss_end = .;
        }
-       .bss_end ___bssend___ (OVERLAY) : {
-               KEEP(*(.__bss_end__));
+       .bss_end __bss_end (OVERLAY) : {
+               KEEP(*(__bss_end));
        }
 
        /DISCARD/ : { *(.dynstr*) }