Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / m28evk.h

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 95eb735dd9349c1a4f88154ce24420641407b972..5b3fa43eb46cbbc0d85f95c849352f385740da74 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -65,6 +65,7 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_GPIO
+#define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
@@ -76,6 +77,9 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_USB
+#define        CONFIG_VIDEO
+
+#define CONFIG_REGEX                   /* Enable regular expression support */
 
 /*
  * Memory configurations
@@ -267,6 +271,24 @@
 #endif
 #endif
 
+/*
+ * LCD
+ */
+#ifdef CONFIG_VIDEO
+#define        CONFIG_CFB_CONSOLE
+#define        CONFIG_VIDEO_MXS
+#define        CONFIG_VIDEO_LOGO
+#define        CONFIG_VIDEO_SW_CURSOR
+#define        CONFIG_VGA_AS_SINGLE_DEVICE
+#define        CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define        CONFIG_SPLASH_SCREEN
+#define        CONFIG_CMD_BMP
+#define        CONFIG_BMP_16BPP
+#define        CONFIG_VIDEO_BMP_RLE8
+#define        CONFIG_VIDEO_BMP_GZIP
+#define        CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  (512 << 10)
+#endif
+
 /*
  * Boot Linux
  */