Merge branch 'master' of git://git.denx.de/u-boot-ti

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

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 2170df5dcb11617fa64b2efd3d68b6361c1943d1..74424527b857a5c7ed9b0ad307aef52cf82da03d 100644 (file)
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -37,8 +37,8 @@
 #define CONFIG_TQM850M         1       /* ...on a TQM8xxM module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT
@@ -475,4 +475,9 @@
 #define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+#define CONFIG_HWCONFIG                1
+
 #endif /* __CONFIG_H */