summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRobby Cai <robby.cai@nxp.com>2016-06-23 14:44:19 +0800
committerRobby Cai <robby.cai@nxp.com>2016-07-29 11:17:14 +0800
commitbcdbe240bb2a97d38ba30dd244a51ece87662b06 (patch)
tree17e3f61dc674c4c065b16dc81f0cda510f5d5106 /include
parentfd8fbf7fa0b10199ac89cd13cae851149f51accb (diff)
downloadu-boot-imx-bcdbe240bb2a97d38ba30dd244a51ece87662b06.zip
u-boot-imx-bcdbe240bb2a97d38ba30dd244a51ece87662b06.tar.gz
u-boot-imx-bcdbe240bb2a97d38ba30dd244a51ece87662b06.tar.bz2
MLK-12929 imx6ull: support splash screen for epdc
add splash screen feature for epdc. it's tested on imx6ull arm2 board. Signed-off-by: Robby Cai <robby.cai@nxp.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6ull_ddr3_arm2.h39
-rw-r--r--include/mxc_epdc_fb.h2
2 files changed, 40 insertions, 1 deletions
diff --git a/include/configs/mx6ull_ddr3_arm2.h b/include/configs/mx6ull_ddr3_arm2.h
index 28562db..9325d33 100644
--- a/include/configs/mx6ull_ddr3_arm2.h
+++ b/include/configs/mx6ull_ddr3_arm2.h
@@ -87,4 +87,43 @@
#define CONFIG_FEC_DMA_MINALIGN 64
#endif
+#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_SPLASH_SCREEN_ALIGN
+#define CONFIG_CMD_BMP
+#define CONFIG_BMP_16BPP
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO_BMP_LOGO
+#define CONFIG_IMX_VIDEO_SKIP
+#endif
+
+/* #define CONFIG_SPLASH_SCREEN*/
+/* #define CONFIG_MXC_EPDC*/
+
+/*
+ * SPLASH SCREEN Configs
+ */
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_MXC_EPDC)
+/*
+ * Framebuffer and LCD
+ */
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_CMD_BMP
+#define CONFIG_LCD
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+
+#undef LCD_TEST_PATTERN
+/* #define CONFIG_SPLASH_IS_IN_MMC 1 */
+#define LCD_BPP LCD_MONOCHROME
+/* #define CONFIG_SPLASH_SCREEN_ALIGN 1 */
+
+#define CONFIG_WAVEFORM_BUF_SIZE 0x400000
+#endif
+
#endif
diff --git a/include/mxc_epdc_fb.h b/include/mxc_epdc_fb.h
index 33761a7..7594958 100644
--- a/include/mxc_epdc_fb.h
+++ b/include/mxc_epdc_fb.h
@@ -193,7 +193,7 @@
#define EPDC_PIGEON_16_0 0xC00
#define EPDC_PIGEON_16_1 0xC10
#define EPDC_PIGEON_16_2 0xC20
-#ifdef CONFIG_MX7
+#if defined(CONFIG_MX7) || defined(CONFIG_MX6ULL)
#define EPDC_WB_ADDR_TCE 0x010
#else
#define EPDC_WB_ADDR_TCE 0xC10