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

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

diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 24905a0129b8a307bf8ebfbd5cd2fc7af967561e..fba897c1eaafb9061d758f0bdd55a8c1f91de2fb 100644 (file)
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -122,7 +122,6 @@
  */
 #define CONFIG_HAS_ETH1
 #define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
 
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE                           FEC_BASE_ADDR
@@ -177,11 +176,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER
 
-/*
- * Stack sizes
- */
-#define CONFIG_STACKSIZE               (128 * 1024)    /* regular stack */
-
 /*
  * Physical Memory Map
  */
@@ -212,12 +206,15 @@
  */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO
-#define CONFIG_VIDEO_MX5
+#define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP
+#define CONFIG_IPUV3_CLK       133000000
 
 #endif                         /* __CONFIG_H */