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

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

diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index 8c46e4677f0bfa9c091ff2957259625f8d4b4196..d6711b5bf2c511b2df0b99025edb2f22a7bba711 100644 (file)
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -66,20 +66,17 @@ SECTIONS
     lib_ppc/time.o             (.text)
 
     . = DEFINED(env_offset) ? 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)   }
@@ -137,6 +134,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);