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

[karo-tx-uboot.git] / board / gaisler / grsim_leon2 / u-boot.lds

diff --git a/board/gaisler/grsim_leon2/u-boot.lds b/board/gaisler/grsim_leon2/u-boot.lds
index 4f90a46cf4bb21ca1d9148df127ebcf287ec61e1..e57f73412170ef2e3140b625e72ff3d492c6a10e 100644 (file)
--- a/board/gaisler/grsim_leon2/u-boot.lds
+++ b/board/gaisler/grsim_leon2/u-boot.lds
@@ -84,14 +84,10 @@ SECTIONS
 
        /* CMD Table */
 
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
-       . = ALIGN(4);
-       __u_boot_cmd_end = .;
 
        . = ALIGN(4);
        .u_boot_list : {
-       #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        .data   :
@@ -137,7 +133,7 @@ SECTIONS
        . = ALIGN(16); /* to speed clearing of bss up */
        }
        __bss_end = . ;
-       __bss_end__ = . ;
+       __bss_end = . ;
        PROVIDE (end = .);
 
 /* Relocated into main memory */