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

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

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 04f538ce517d09246627ebc7082c4d9e6dc54c55..9ec815c6004265cabe9cd11b5e210c82fbc57758 100644 (file)
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -51,7 +51,8 @@
 #endif
 
 #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 @@
 
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#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 */