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

[oweals/u-boot.git] / board / amcc / bamboo / u-boot.lds

diff --git a/board/amcc/bamboo/u-boot.lds b/board/amcc/bamboo/u-boot.lds
index 25d917a4f2a784bb1d8f4bfa1965aa92a0a183e2..bcde534dfd872a90f9b5906ce0c584ad6b6dd137 100644 (file)
--- a/board/amcc/bamboo/u-boot.lds
+++ b/board/amcc/bamboo/u-boot.lds
@@ -70,17 +70,14 @@ SECTIONS
     board/amcc/bamboo/bamboo.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)   }
@@ -138,6 +135,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
 
   _end = . ;