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

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

diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index 13b29084f1820b010060dcadb89fc6945627f161..7b9455b25289221add2738ff80b2b343c842caf2 100644 (file)
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds
@@ -53,19 +53,16 @@ SECTIONS
   .text      :
   {
     cpu/mpc8xx/start.o (.text)
-    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)   }
@@ -123,6 +120,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);