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

[u-boot] / board / RRvision / u-boot.lds

diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index ce1148d958a3539533c4e0eaf4f373b1187749cb..f22b25fc3d027730a59dabd26a9215a3a05308a7 100644 (file)
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -69,17 +69,14 @@ SECTIONS
     common/env_embedded.o      (.ppcenv)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -137,6 +134,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);