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

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

diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds
index 216f9c64dc6ed59553b83148df95cf152e0ab7a5..f509100dc296499600366806c978861b6ffa06f2 100644 (file)
--- a/board/sandburst/karef/u-boot.lds
+++ b/board/sandburst/karef/u-boot.lds
@@ -74,14 +74,14 @@ SECTIONS
     cpu/ppc4xx/4xx_uart.o      (.text)
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
-/*    common/environment.o(.text)*/
+/*    common/env_embedded.o(.text)*/
 
     *(.text)
     *(.fixup)
@@ -91,10 +91,8 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -152,6 +150,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);