Merge branch 'mimc200' into next

[u-boot] / board / esd / dp405 / u-boot.lds

diff --git a/board/esd/dp405/u-boot.lds b/board/esd/dp405/u-boot.lds
index 7ff074c152ed5a6369351280009248d6a52b76e6..d8fbea396b6309f2e77ea84b940034fd72e46d97 100644 (file)
--- a/board/esd/dp405/u-boot.lds
+++ b/board/esd/dp405/u-boot.lds
@@ -66,7 +66,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)
@@ -144,6 +144,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);