Merge with testing-4xx_enet (Create generic 4xx Ethernet code)

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

diff --git a/board/esd/cpci440/u-boot.lds b/board/esd/cpci440/u-boot.lds
index ddb152cb4708661ccabe83c8d12fa533d5d20e51..24c35268dfb70d51f5af4e89e4b9f4e269216820 100644 (file)
--- a/board/esd/cpci440/u-boot.lds
+++ b/board/esd/cpci440/u-boot.lds
@@ -28,11 +28,13 @@ SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/
 SECTIONS
 {
   .resetvec 0xFFFFFFFC :
+/*  .resetvec 0x01FFFFFC :*/
   {
     *(.resetvec)
   } = 0xffff
 
   .bootpg 0xFFFFF000 :
+/*  .bootpg 0x01FFF000 :*/
   {
     cpu/ppc4xx/start.o (.bootpg)
   } = 0xffff
@@ -74,7 +76,6 @@ SECTIONS
     cpu/ppc4xx/serial.o        (.text)
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
-    cpu/ppc4xx/405gp_enet.o    (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)
@@ -93,6 +94,7 @@ SECTIONS
   {
     *(.rodata)
     *(.rodata1)
+    *(.rodata.str1.4)
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -125,6 +127,11 @@ SECTIONS
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;