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

[u-boot] / arch / nios2 / cpu / u-boot.lds

diff --git a/arch/nios2/cpu/u-boot.lds b/arch/nios2/cpu/u-boot.lds
index e24b769b5ee923447c46a4fc5b15f80c1d24e4f6..4c45336d4ae40536f06dbde3e01cdc40d01b5c85 100644 (file)
--- a/arch/nios2/cpu/u-boot.lds
+++ b/arch/nios2/cpu/u-boot.lds
@@ -45,17 +45,10 @@ SECTIONS
         * the initialization code relocates the command table as
         * well -- admittedly, this is just pure laziness ;-)
         */
-       __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*)));
        }
 
        /* INIT DATA sections - "Small" data (see the gcc -G option)
@@ -108,7 +101,7 @@ SECTIONS
          *(.scommon)
        }
        . = ALIGN(4);
-       __bss_end__ = .;
+       __bss_end = .;
        PROVIDE (end = .);
 
        /* DEBUG -- symbol table, string table, etc. etc.