diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
commit | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (patch) | |
tree | 5dbc1813bfa548e8d31879c39c075bfdcbbf8f86 /include/configs/TQM5200.h | |
parent | 3c89d75409eb26639d36dfa11d4ee3d8b962dc3c (diff) | |
parent | e60adeac2d8fa30258e1706bb342a3363526e8d7 (diff) | |
download | talos-obmc-uboot-3cac27c1d40b151f295dcfdb514fa928732e4ecf.tar.gz talos-obmc-uboot-3cac27c1d40b151f295dcfdb514fa928732e4ecf.zip |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'include/configs/TQM5200.h')
-rw-r--r-- | include/configs/TQM5200.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index d55340404d..7ecc275a1c 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -257,8 +257,8 @@ "fdt_addr=FC0A0000\0" \ "kernel_addr=FC0C0000\0" \ "ramdisk_addr=FC300000\0" \ - "kernel_addr_r=200000\0" \ - "fdt_addr_r=400000\0" \ + "kernel_addr_r=400000\0" \ + "fdt_addr_r=600000\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -547,7 +547,7 @@ # if defined (CONFIG_TQM5200_REV100) # error TQM5200 REV100 not supported on STK52XX REV200 or above # else/* TQM5200 REV200 and above */ -# define CFG_GPS_PORT_CONFIG 0x91500004 +# define CFG_GPS_PORT_CONFIG 0x91500404 # endif # endif #elif defined (CONFIG_FO300) |