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

[platform/kernel/u-boot.git] / include / configs / vision2.h

diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index b5c7357..3b42afc 100644 (file)
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -41,10 +41,12 @@
 #define CONFIG_INITRD_TAG
 #define BOARD_LATE_INIT
 
+#define CONFIG_MACH_TYPE       MACH_TYPE_TTC_VISION2
+
 /*
  * Size of malloc() pool
  */
-#define CONFIG_SYS_MALLOC_LEN          (2048 * 1024)
+#define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
 
 /*
  * Hardware drivers
@@ -114,7 +116,6 @@
  * Eth Configs
  */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 
@@ -206,12 +207,11 @@
  * Framebuffer and LCD
  */
 #define CONFIG_PREBOOT
-#define CONFIG_LCD
+#define CONFIG_VIDEO
 #define CONFIG_VIDEO_MX5
-#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define LCD_BPP                LCD_COLOR16
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP