Merge branch 'reloc'

[u-boot] / board / eltec / elppc / u-boot.lds

diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds
index b6b37ef34f02117a69ee640faa954d898a2b5a07..d0213311488df9a72c1fb8a752e5b5cd9a9c5f81 100644 (file)
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds
@@ -63,17 +63,14 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.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)   }
@@ -131,6 +128,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);