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

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

diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index e41782554f0e3e1bcd9eae7373a82b1ccc3719a9..e0ea600d28c976c330f39830755752985fb11244 100644 (file)
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -63,20 +63,17 @@ SECTIONS
     lib_generic/zlib.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)   }
@@ -133,6 +130,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);