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

[oweals/u-boot.git] / board / esd / ar405 / u-boot.lds

diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds
index 89cd067346a3d154c8385a0b93ac55cc87fe17d6..2c1cf92060b3e01efe07a5c2ce89b681478bc262 100644 (file)
--- a/board/esd/ar405/u-boot.lds
+++ b/board/esd/ar405/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)
@@ -83,9 +83,9 @@ SECTIONS
 
 /*
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 */
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)
@@ -156,6 +156,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);