Merge branch 'master' of git://www.denx.de/git/u-boot-mmc

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

diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds
index 3848c684ab79422624e8557caca2879527832e1a..7df6e833926f59f99a31dfd7c4ac9a1e7e7d486f 100644 (file)
--- a/board/gaisler/gr_xc3s_1500/u-boot.lds
+++ b/board/gaisler/gr_xc3s_1500/u-boot.lds
@@ -60,8 +60,8 @@ SECTIONS
                _text = .;
 
                *(.start)
-               cpu/leon3/start.o (.text)
-/* 8k is the same as the PROM offset from end of main memory, (CFG_PROM_SIZE) */
+               arch/sparc/cpu/leon3/start.o (.text)
+/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
                . = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,
  * no global data accesses please.
@@ -77,20 +77,19 @@ SECTIONS
                *(.gnu.warning)
 /*             *(.got1)*/
                . = ALIGN(16);
-               *(.rodata)
-               *(.rodata1)
-               *(.rodata.*)
                *(.eh_frame)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
        . = ALIGN(4);
        _etext = .;
 
        /* CMD Table */
 
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
+
        . = ALIGN(4);
-       __u_boot_cmd_end = .;
+       .u_boot_list : {
+       #include <u-boot.lst>
+       }
 
        .data   :
        {
@@ -136,7 +135,7 @@ SECTIONS
        . = ALIGN(16); /* to speed clearing of bss up */
        }
        __bss_end = . ;
-       _end = . ;
+       __bss_end__ = . ;
        PROVIDE (end = .);
 
 /* Relocated into main memory */