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

[oweals/u-boot.git] / include / configs / KUP4X.h

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index 849f3082673da3640a922aaf566d117567d9e88e..cd38b0f2c2f4b790d649f53337d8e1fab9bd5a7d 100644 (file)
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2004
+ * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de
  *
@@ -48,8 +48,6 @@
 #define CONFIG_BOOTDELAY       1       /* autoboot after 1 second              */
 #endif
 
-#define CONFIG_CLOCKS_IN_MHZ   1       /* clocks passsed to Linux in MHz       */
-
 #define CONFIG_BOARD_TYPES     1       /* support board types                  */
 
 #define CFG_8XX_FACT           8       /* Multiply by 8                        */
@@ -74,15 +72,15 @@
  usb stop; bootm 200000\0"      \
 "nfs_boot=dhcp;run nfsargs addip addhw;bootm 200000\0"                         \
 "panic_boot=echo No Bootdevice !!! reset\0"                                    \
-"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\0"   \
+"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"   \
 "ramargs=setenv bootargs root=/dev/ram rw\0"                                   \
-"addip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):$(gatewayip)"      \
- ":$(netmask):$(hostname):$(netdev):off\0"                                     \
-"addhw=setenv bootargs $(bootargs) hw=$(hw) key1=$(key1) panic=1\0"            \
+"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}"      \
+ ":${netmask}:${hostname}:${netdev}:off\0"                                     \
+"addhw=setenv bootargs ${bootargs} hw=${hw} key1=${key1} panic=1\0"            \
 "netdev=eth0\0"                                                                        \
 "silent=1\0"                                                                   \
 "load=tftp 200000 bootloader-4x.bitmap;tftp 100000 bootloader-4x.bin\0"                \
-"update=protect off 1:0-5;era 1:0-5;cp.b 100000 40000000 $(filesize);"         \
+"update=protect off 1:0-5;era 1:0-5;cp.b 100000 40000000 ${filesize};"         \
  "cp.b 200000 40040000 14000\0"
 
 #define CONFIG_BOOTCOMMAND  \
@@ -152,6 +150,7 @@
 #define CONFIG_RTC_PCF8563             /* use Philips PCF8563 RTC      */
 
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII
 
 #if 0
 #define CONFIG_ETHADDR                  00:0B:64:80:00:00 /* our OUI from IEEE */
@@ -177,13 +176,15 @@
 #endif
 
 #define CONFIG_COMMANDS              ( CONFIG_CMD_DFL  | \
+                               CFG_CMD_DATE    | \
                                CFG_CMD_DHCP    | \
+                               CFG_CMD_FAT     | \
                                CFG_CMD_I2C     | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_POST_DIAG       | \
                                CFG_CMD_IDE     | \
-                               CFG_CMD_USB     | \
-                               CFG_CMD_FAT)
+                               CFG_CMD_NFS     | \
+                               CFG_CMD_POST_DIAG       | \
+                               CFG_CMD_SNTP    | \
+                               CFG_CMD_USB     )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>