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

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

diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 5f5fb0d58e3fffce2d0ad49f399d2d0ea6868272..7b74cb7d5f60c45655d50b790ebf551c3ecdb32d 100644 (file)
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -63,20 +63,17 @@ SECTIONS
     lib_ppc/cache.o            (.text)
     lib_generic/crc32.o                (.text)
     . = env_offset;
-    common/environment.o(.text)
+    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)   }
@@ -134,6 +131,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);