Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / mousse / u-boot.lds.ram

diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index 68c4ccaacf660000090af13bad58835b6d0d5908..2055429b4b1221a932efa0b71d7640b5c0e625d7 100644 (file)
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -24,9 +24,9 @@
 OUTPUT_ARCH(powerpc)
 
 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
@@ -37,7 +37,7 @@ SECTIONS
   PROVIDE(_f_init_rom = .);
 
   .init : {
-      cpu/mpc824x/start.o      (.text)
+      arch/powerpc/cpu/mpc824x/start.o (.text)
       *(.init)
   } > ram
   _init_size = SIZEOF(.init);
@@ -85,9 +85,6 @@ SECTIONS
   } > ram
   */
 
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
 
    __start___ex_table = .;
     __ex_table : { *(__ex_table) } > ram
@@ -96,9 +93,9 @@ SECTIONS
 
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   } > ram
 
-  _end = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }