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

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

diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds
index ea5fafe2b4bae60693e82db547987d7199a0a1ff..f6175d9d57096fd44d93a2a1a77ff8f37d4752ed 100644 (file)
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds
@@ -55,17 +55,14 @@ SECTIONS
     cpu/mpc8xx/start.o(.text)
     *(.text)
     common/env_embedded.o(.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)   }
@@ -123,6 +120,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);