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

[karo-tx-uboot.git] / board / altera / ep1s40 / u-boot.lds

diff --git a/board/altera/ep1s40/u-boot.lds b/board/altera/ep1s40/u-boot.lds
index b99b82c826cf0062b4e3f2775123d1a229ecf46b..b909e94f8fcfa48a532ae1cf69aed7d33c16e1f8 100644 (file)
--- a/board/altera/ep1s40/u-boot.lds
+++ b/board/altera/ep1s40/u-boot.lds
@@ -30,12 +30,11 @@ SECTIONS
 {
        .text :
        {
-         cpu/nios2/start.o (.text)
+         arch/nios/cpu2/start.o (.text)
          *(.text)
          *(.text.*)
          *(.gnu.linkonce.t*)
-         *(.rodata)
-         *(.rodata.*)
+         *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
          *(.gnu.linkonce.r*)
        }
        . = ALIGN (4);
@@ -87,7 +86,7 @@ SECTIONS
         * bss follows. We keep it adjacent to simplify init code.
         */
        __bss_start = .;
-       .sbss :
+       .sbss (NOLOAD) :
        {
          *(.sbss)
          *(.sbss.*)
@@ -95,7 +94,7 @@ SECTIONS
          *(.scommon)
        }
        . = ALIGN(4);
-       .bss :
+       .bss (NOLOAD) :
        {
          *(.bss)
          *(.bss.*)