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

[u-boot] / board / gaisler / gr_ep2s60 / u-boot.lds

diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds
index e461a36fa416eda9f0d515f84b7513c8181b524b..f6d13014f311b407ad4a9185e07c0c4535993ce7 100644 (file)
--- a/board/gaisler/gr_ep2s60/u-boot.lds
+++ b/board/gaisler/gr_ep2s60/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
                _text = .;
 
                *(.start)
-               cpu/leon3/start.o (.text)
+               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,
@@ -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   :
        {
@@ -135,7 +134,7 @@ SECTIONS
        . = ALIGN(16); /* to speed clearing of bss up */
        }
        __bss_end = . ;
-       _end = . ;
+       __bss_end__ = . ;
        PROVIDE (end = .);
 
 /* Relocated into main memory */