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

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

diff --git a/board/lwmon5/u-boot.lds b/board/lwmon5/u-boot.lds
index 3cfec834e2dbcd31261163b96a69446f325a435d..b9ec56bb2062e7b041c192eb6bc65f85ae80ca32 100644 (file)
--- a/board/lwmon5/u-boot.lds
+++ b/board/lwmon5/u-boot.lds
@@ -68,16 +68,13 @@ SECTIONS
     cpu/ppc4xx/start.o (.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -135,6 +132,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
 
   ppcenv_assert = ASSERT(. < 0xFFFF8000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");