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

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

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index a84f0dd..e6266b5 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2001-2003
+ * (C) Copyright 2001-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -52,17 +52,26 @@
 #define CONFIG_TQM8260         200     /* ...on a TQM8260 module Rev.200       */
 #endif
 
+#define CONFIG_CPM2            1       /* Has a CPM2 */
+
 #define CONFIG_82xx_CONS_SMC1  1       /* console on SMC1                      */
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
-#define        CONFIG_CLOCKS_IN_MHZ    1       /* clocks passsed to Linux in MHz */
+#define        CONFIG_BOOTCOUNT_LIMIT
+
+#if defined(CONFIG_CONS_NONE) || defined(CONFIG_CONS_USE_EXTC)
+#define CONFIG_BAUDRATE                230400
+#else
+#define CONFIG_BAUDRATE                9600
+#endif
 
 #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
 
 #undef CONFIG_BOOTARGS
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+       "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=$(serverip):$(rootpath)\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
@@ -204,22 +213,21 @@
 # endif
 #endif /* CONFIG_MPC8255 */
 
-#if defined(CONFIG_CONS_NONE) || defined(CONFIG_CONS_USE_EXTC)
-#define CONFIG_BAUDRATE                230400
-#else
-#define CONFIG_BAUDRATE                9600
-#endif
-
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #undef CFG_LOADS_BAUD_CHANGE           /* don't allow baudrate change  */
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+
 #define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_I2C    | \
-                                CFG_CMD_EEPROM)
+#define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
+                               CFG_CMD_DHCP    | \
+                               CFG_CMD_I2C     | \
+                               CFG_CMD_EEPROM  | \
+                               CFG_CMD_NFS     | \
+                               CFG_CMD_SNTP    )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>