Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE

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

diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds
index 3958670bb18e5725034d7f7076c1bbf78accaa60..22826823cc327611b4568744e1bc278f156338a0 100644 (file)
--- a/board/gaisler/gr_cpci_ax2000/u-boot.lds
+++ b/board/gaisler/gr_cpci_ax2000/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,10 +77,8 @@ SECTIONS
                *(.gnu.warning)
 /*             *(.got1)*/
                . = ALIGN(16);
-               *(.rodata)
-               *(.rodata1)
-               *(.rodata.*)
                *(.eh_frame)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
        . = ALIGN(4);
        _etext = .;