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

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

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 47a87862c2ac3c545932acbf8b5826d0c3a55c41..6613f90a770075547700e0cfd12c08d5fc0023b6 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -50,7 +50,7 @@
  * generated by the DS1337 - and the DS1337 clock can be turned off.
  */
 #if !defined(CONFIG_SC)
-#define        CONFIG_8xx_GCLK_FREQ                    66600000 
+#define        CONFIG_8xx_GCLK_FREQ                    66600000
 #else
 #define        CONFIG_8xx_GCLK_FREQ                    48000000
 #endif
@@ -92,8 +92,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND     \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 
 /*
@@ -204,7 +204,7 @@
  * length of time, so we use an external RTC on the I2C bus instead.
  */
 #define CONFIG_RTC_DS1337
-#define CFG_I2C_RTC_ADDR                               0x68 
+#define CFG_I2C_RTC_ADDR                               0x68
 
 #else
 /*
@@ -248,7 +248,7 @@
                                                                CFG_CMD_POST_DIAG )
 
 #if !defined(CONFIG_SC)
-#define        CONFIG_COMMANDS ( BASE_CONFIG_COMMANDS | CFG_CMD_DOC ) 
+#define        CONFIG_COMMANDS ( BASE_CONFIG_COMMANDS | CFG_CMD_DOC )
 #else
 #define CONFIG_COMMANDS        BASE_CONFIG_COMMANDS
 #endif
@@ -284,6 +284,8 @@
  */
 #include <cmd_confdefs.h>
 
+#define CFG_NAND_LEGACY
+
 /*
  * Verbose help from command monitor.
  */