diff options
| author | Robby Cai <robby.cai@nxp.com> | 2016-06-23 14:44:19 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:06:24 +0800 |
| commit | ffc1f0d1b19d4adfc1f5276e5d25a1f065c41606 (patch) | |
| tree | ea055e29ac78df710ae3b991d87ab98d1689f06f /include | |
| parent | 126d2e1ac5b53fc32dbd0000b2a22c11bfbcd19c (diff) | |
| download | u-boot-imx-ffc1f0d1b19d4adfc1f5276e5d25a1f065c41606.zip u-boot-imx-ffc1f0d1b19d4adfc1f5276e5d25a1f065c41606.tar.gz u-boot-imx-ffc1f0d1b19d4adfc1f5276e5d25a1f065c41606.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>
(cherry picked from commit bcdbe240bb2a97d38ba30dd244a51ece87662b06)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6ull_ddr3_arm2.h | 39 | ||||
| -rw-r--r-- | include/mxc_epdc_fb.h | 2 |
2 files changed, 40 insertions, 1 deletions
diff --git a/include/configs/mx6ull_ddr3_arm2.h b/include/configs/mx6ull_ddr3_arm2.h index f612209..e4d8d93 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 |