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

[u-boot] / 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 ddd27d455e14f1d35fa6b48006b4c9d658d621fb..18dfb814bf61eb9873967af6cc8218fc5f046fb6 100644 (file)
--- a/board/gaisler/gr_xc3s_1500/u-boot.lds
+++ b/board/gaisler/gr_xc3s_1500/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 : {
+               KEEP(*(SORT(.u_boot_list*)));
+       }
 
        .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 */