ppc4xx: Fix TLB reset problem with recent 44x images

[oweals/u-boot.git] / board / eric / u-boot.lds

diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds
index 153e71f891aaa87d1e4b806e004186a031918c6c..e62896f12f93bc2bba26c28e9f29868e7044564a 100644 (file)
--- a/board/eric/u-boot.lds
+++ b/board/eric/u-boot.lds
@@ -68,7 +68,7 @@ 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)
@@ -85,10 +85,8 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -146,6 +144,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);