Merge with /home/sr/git/u-boot

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

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 1542047..61022e8 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -1,7 +1,7 @@
 /*
  * ueberarbeitet durch Christoph Seyfert
  *
- * (C) Copyright 2004 DENX Software Engineering,
+ * (C) Copyright 2004-2005 DENX Software Engineering,
  *     Wolfgang Grandegger <wg@denx.de>
  * (C) Copyright 2003
  *     DAVE Srl
@@ -98,6 +98,7 @@
 /* Ethernet stuff */
 #define CONFIG_ENV_OVERWRITE /* Let the user to change the Ethernet MAC addresses */
 #define CONFIG_ETHADDR 00:50:C2:1E:AF:FE
+#define CONFIG_HAS_ETH1
 #define CONFIG_ETH1ADDR 00:50:C2:1E:AF:FD
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
@@ -109,21 +110,26 @@
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #ifndef         CONFIG_EXT_PHY
-#define CONFIG_PHY_ADDR                0       /* EMAC0 PHY address            */
-#define CONFIG_PHY1_ADDR       1       /* EMAC1 PHY address            */
+#define CONFIG_PHY_ADDR                1       /* EMAC0 PHY address            */
+#define CONFIG_PHY1_ADDR       16      /* EMAC1 PHY address            */
 #else
 #define CONFIG_PHY_ADDR                2       /* PHY address                  */
 #endif
 #define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ
 
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+
 #define CONFIG_COMMANDS              ( CONFIG_CMD_DFL  | \
+                               CFG_CMD_DHCP    | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_EEPROM  | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IRQ     | \
                                CFG_CMD_JFFS2   | \
                                CFG_CMD_MII     | \
-                               CFG_CMD_NAND    )
+                               CFG_CMD_NAND    | \
+                               CFG_CMD_NFS     | \
+                               CFG_CMD_SNTP    )
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION