Merge branch 'wd'

[u-boot] / include / configs / pcs440ep.h

diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index 854809dab83cbd9e23ceb439fa9cd5a3847cef90..50c1c4fd4cb0a6d91db463bf7cf459652718387f 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -42,7 +42,7 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
-#define CFG_MONITOR_LEN                (512 * 1024)    /* Reserve 512 kB for Monitor   */
+#define CFG_MONITOR_LEN                (384 * 1024)    /* Reserve 384 kB for Monitor   */
 #define CFG_MALLOC_LEN         (256 * 1024)    /* Reserve 256 kB for malloc()  */
 #define CFG_MONITOR_BASE       (-CFG_MONITOR_LEN)
 #define CFG_SDRAM_BASE         0x00000000          /* _must_ be 0      */
@@ -116,18 +116,17 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_SPD_EEPROM               /* Use SPD EEPROM for setup             */
 #undef CONFIG_DDR_ECC                  /* don't use ECC                        */
-#define SPD_EEPROM_ADDRESS      {0x50, 0x51}
+#define SPD_EEPROM_ADDRESS      {0x50}
 
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C                1           /* I2C with hardware support        */
 #undef CONFIG_SOFT_I2C                     /* I2C bit-banged           */
-#define CFG_I2C_SPEED          400000  /* I2C speed and slave address  */
+#define CFG_I2C_SPEED          100000  /* I2C speed and slave address  */
 #define CFG_I2C_SLAVE          0x7F
 
-#define CFG_I2C_MULTI_EEPROMS
-#define CFG_I2C_EEPROM_ADDR    (0xa8>>1)
+#define CFG_I2C_EEPROM_ADDR    (0xa4>>1)
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 #define CFG_EEPROM_PAGE_WRITE_BITS 3
@@ -157,12 +156,11 @@
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/pcs440ep/uImage\0"                          \
-       "kernel_addr=fff00000\0"                                        \
-       "ramdisk_addr=fff00000\0"                                       \
+       "kernel_addr=FFF00000\0"                                        \
+       "ramdisk_addr=FFF00000\0"                                       \
        "load=tftp 100000 /tftpboot/pcs440ep/u-boot.bin\0"              \
-       "update=protect off fff80000 ffffffff;era fff80000 ffffffff;"   \
-               "cp.b 100000 fff80000 80000;"                           \
-               "setenv filesize;saveenv\0"                             \
+       "update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;"   \
+               "cp.b 100000 FFFA0000 60000\0"                          \
        "upd=run load;run update\0"                                     \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
@@ -212,6 +210,7 @@
                                CFG_CMD_ASKENV  | \
                                CFG_CMD_DHCP    | \
                                CFG_CMD_DIAG    | \
+                               CFG_CMD_EEPROM  | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IRQ     | \