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

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

diff --git a/board/zeus/u-boot.lds b/board/zeus/u-boot.lds
index d803625b5a96ce7ca019d44c92a1507e4cd524da..f3ccd33e7c17751a3c41be5641fb7819ba6def30 100644 (file)
--- a/board/zeus/u-boot.lds
+++ b/board/zeus/u-boot.lds
@@ -60,16 +60,13 @@ SECTIONS
     cpu/ppc4xx/start.o (.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -126,6 +123,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);