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

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

diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 9ebafcccbca4ca35177eefca0248e8acc65705f5..7046e6739d648130f6aa20a54c5f3dd77612fc57 100644 (file)
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -38,8 +38,8 @@
 #define        CONFIG_TQM8xxL          1
 
 #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
@@ -491,4 +491,10 @@
                                                OR_SCY_2_CLK)
 #define CONFIG_SYS_BR4_PRELIM ((CONFIG_SYS_PERIPHERAL_BASE & BR_BA_MSK) | BR_PS_8 | BR_V)
 #define PCMCIA_CTRL (CONFIG_SYS_PERIPHERAL_BASE + 0xB00)
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+#define CONFIG_HWCONFIG                1
+
 #endif /* __CONFIG_H */