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

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

diff --git a/board/jse/u-boot.lds b/board/jse/u-boot.lds
index 7e060cbfd0eb536418caca931fff01ca24a648fc..12d3938fc1cf299d1739eee0fbd8c5bcb4385f09 100644 (file)
--- a/board/jse/u-boot.lds
+++ b/board/jse/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/kgdb.o  (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)
@@ -75,10 +75,8 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -136,6 +134,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);