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

[u-boot] / board / genietv / u-boot.lds

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 3573608d2b2fa4bab4a27edac09a67c24497d3bf..716efcdd0ba47be755e055a5489b79c09c842f7c 100644 (file)
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -63,19 +63,16 @@ 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)   }
@@ -137,8 +134,9 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
+  . = ALIGN(4);
   _end = . ;
   PROVIDE (end = .);
 }