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

[u-boot] / board / mousse / u-boot.lds.ram

diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index 9166c9cd78234fabfa4975fe363ff0d856d85873..d048e52d35ad481038c8e578811801926574fe63 100644 (file)
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -22,12 +22,11 @@
  */
 
 OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
 
 MEMORY {
-       ram  (!rx) : org = 0x00000000 , LENGTH = 8M
-       code (!rx) : org = 0x00002000 , LENGTH = (4M - 0x2000)
-       rom   (rx) : org = 0xfff00000 , LENGTH = 512K
+       ram  (!rx) : org = 0x00000000 , LENGTH = 8M
+       code (!rx) : org = 0x00002000 , LENGTH = (4M - 0x2000)
+       rom   (rx) : org = 0xfff00000 , LENGTH = 512K
 }
 
 SECTIONS
@@ -85,6 +84,11 @@ SECTIONS
     *(.fixup)
   } > ram
   */
+
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
    __start___ex_table = .;
     __ex_table : { *(__ex_table) } > ram
     __stop___ex_table = .;
@@ -92,10 +96,9 @@ SECTIONS
 
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   } > ram
 
   _end = . ;
   PROVIDE (end = .);
 }
-