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

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

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index e975f549bdb18b413487af79960f49f1e42b95aa..ba4a4a623c10403fdd9aa196fb4a0b2044bcc2be 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -128,6 +128,8 @@
 #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_BMP_16BPP
@@ -215,13 +217,6 @@
 #define CONFIG_SYS_HZ          1000
 #define CONFIG_CMDLINE_EDITING
 
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       (128 * 1024)    /* regular stack */
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */