Merge with /home/wd/git/u-boot/jon_loeliger

[platform/kernel/u-boot.git] / include / configs / PM854.h

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 12a7181..07e3f06 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -104,7 +104,7 @@
     /*
      * Determine DDR configuration from I2C interface.
      */
-    #define SPD_EEPROM_ADDRESS 0x51            /* DDR DIMM */
+    #define SPD_EEPROM_ADDRESS 0x58            /* DDR DIMM */
 
 #else
     /*
@@ -146,6 +146,12 @@
 #undef CFG_RAMBOOT
 #endif
 
+#define CFG_FLASH_CFI_DRIVER
+#define CFG_FLASH_CFI
+#define CFG_FLASH_EMPTY_INFO
+
+#undef CONFIG_CLOCKS_IN_MHZ
+
 /*
  * Local Bus Definitions
  */
@@ -255,14 +261,14 @@
 #define CONFIG_MPC85XX_TSEC1_NAME      "TSEC0"
 #define CONFIG_MPC85XX_TSEC2   1
 #define CONFIG_MPC85XX_TSEC2_NAME      "TSEC1"
-#define TSEC1_PHY_ADDR         2
-#define TSEC2_PHY_ADDR         3
+#define TSEC1_PHY_ADDR         0
+#define TSEC2_PHY_ADDR         1
 #define TSEC1_PHYIDX           0
 #define TSEC2_PHYIDX           0
 
 #define CONFIG_MPC85XX_FEC     1
 #define CONFIG_MPC85XX_FEC_NAME                "FEC"
-#define FEC_PHY_ADDR           1
+#define FEC_PHY_ADDR           3
 #define FEC_PHYIDX             0
 
 /* Options are: TSEC[0-1] */
@@ -388,13 +394,13 @@
 #define CONFIG_ETH2ADDR         00:40:42:01:00:02
 #endif
 
-#define CONFIG_IPADDR   192.168.0.103
 
-#define CONFIG_HOSTNAME                PM854
-#define CONFIG_ROOTPATH                /opt/eldk30/ppc_82xx
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_ROOTPATH                /opt/eldk/ppc_85xx
+#define CONFIG_BOOTFILE                pm854/uImage
 
-#define CONFIG_SERVERIP         192.168.0.54
+#define CONFIG_HOSTNAME                pm854
+#define CONFIG_IPADDR   192.168.0.103
+#define CONFIG_SERVERIP         192.168.0.64
 #define CONFIG_GATEWAYIP 192.168.0.1
 #define CONFIG_NETMASK  255.255.255.0
 
@@ -409,7 +415,7 @@
    "netdev=eth0\0"                                                     \
    "consoledev=ttyS0\0"                                                        \
    "ramdiskaddr=400000\0"                                              \
-   "ramdiskfile=uRamdisk\0"
+   "ramdiskfile=pm854/uRamdisk\0"
 
 #define CONFIG_NFSBOOTCOMMAND                                          \
    "setenv bootargs root=/dev/nfs rw "                                 \