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

[oweals/u-boot.git] / board / xilinx / ppc440-generic / u-boot-rom.lds

diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds
index 57c809e4cb4cc78cdb9a4b46fcdd2a74c1660369..b67617dcad2d3851f7a186abdb6d130b4876dd68 100644 (file)
--- a/board/xilinx/ppc440-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc440-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
 
   .bootpg 0xFFFFF000 :
   {
-    cpu/ppc4xx/start.o (.bootpg)
+    arch/powerpc/cpu/ppc4xx/start.o    (.bootpg)
   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
@@ -135,7 +135,7 @@ SECTIONS
    . = ALIGN(4);
   }
 
-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified.");
 
   _end = . ;
   PROVIDE (end = .);