Merge branch 'next' of ../custodians into next

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

diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 4c80bad133e187af4a2109591d261537a27421d4..c715c0783eb7bcbdfcc9a5d7ef2ef71b50191937 100644 (file)
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -47,7 +47,8 @@
                                                /* 'cpuclk' variable with valid value)  */
 
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define CONFIG_BOOTCOUNT_LIMIT
@@ -505,6 +506,11 @@
                                           switching to another netwok (if the
                                           tried network is unreachable) */
 
-#define CONFIG_ETHPRIME                "SCC ETHERNET"
+#define CONFIG_ETHPRIME                "SCC"
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+#define CONFIG_HWCONFIG                1
 
 #endif /* __CONFIG_H */