Merge branch 'reloc'

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

diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 7bcf061555f915b05bd7813c2841b1c3148977bd..6f2ea9a613d5b3c9f10e91a482d31cecfe08925f 100644 (file)
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -68,20 +68,17 @@ SECTIONS
 /*
     . = env_offset;
 */
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 
     *(.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)   }
@@ -139,6 +136,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);