diff options
| author | Robby Cai <robby.cai@nxp.com> | 2016-11-18 17:10:11 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-06 10:08:45 +0800 |
| commit | d459c153296ff16ec49f521713ffc899f301901a (patch) | |
| tree | 2e8296a01b274a1ff1ba21a27592bfe289a82922 /include | |
| parent | a99815b57dee42e5b4167174ff5904a1dd3c2d61 (diff) | |
| download | u-boot-imx-d459c153296ff16ec49f521713ffc899f301901a.zip u-boot-imx-d459c153296ff16ec49f521713ffc899f301901a.tar.gz u-boot-imx-d459c153296ff16ec49f521713ffc899f301901a.tar.bz2 | |
MLK-13499 imx6sll: add epdc splash screen support
add splash screen feature for epdc.
it's tested on imx6sll arm2 board and evk board.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit c85c6f2a0f08dfc6c2859fe969b2021ab32b9370)
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sll_arm2.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6sllevk.h | 15 | ||||
| -rw-r--r-- | include/mxc_epdc_fb.h | 6 |
3 files changed, 19 insertions, 8 deletions
diff --git a/include/configs/mx6sll_arm2.h b/include/configs/mx6sll_arm2.h index 3aa1f26..b71c0b6 100644 --- a/include/configs/mx6sll_arm2.h +++ b/include/configs/mx6sll_arm2.h @@ -223,14 +223,10 @@ */ #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP - #define CONFIG_LCD - #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#ifdef CONFIG_MXC_EPDC #undef LCD_TEST_PATTERN #define LCD_BPP LCD_MONOCHROME #define CONFIG_WAVEFORM_BUF_SIZE 0x200000 -#endif -#endif /* CONFIG_SPLASH_SCREEN */ +#endif /* CONFIG_MXC_EPDC */ #endif /* __CONFIG_H */ diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 67a20f7..200c21a 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -173,4 +173,19 @@ #define CONFIG_IMX_VIDEO_SKIP #endif +/* + * EPDC SPLASH SCREEN Configs + */ +#ifdef CONFIG_MXC_EPDC + /* + * Framebuffer and LCD + */ + #define CONFIG_SPLASH_SCREEN + #define CONFIG_CMD_BMP + #undef LCD_TEST_PATTERN + #define LCD_BPP LCD_MONOCHROME + + #define CONFIG_WAVEFORM_BUF_SIZE 0x200000 +#endif /* CONFIG_MXC_EPDC */ + #endif /* __CONFIG_H */ diff --git a/include/mxc_epdc_fb.h b/include/mxc_epdc_fb.h index 7594958..a32ebac 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 -#if defined(CONFIG_MX7) || defined(CONFIG_MX6ULL) +#if defined(CONFIG_MX7) || defined(CONFIG_MX6ULL) || defined(CONFIG_MX6SLL) #define EPDC_WB_ADDR_TCE 0x010 #else #define EPDC_WB_ADDR_TCE 0xC10 @@ -306,7 +306,7 @@ enum { /* EPDC_UPD_CTRL field values */ EPDC_UPD_CTRL_USE_FIXED = 0x80000000, -#ifdef CONFIG_MX7 +#if defined(CONFIG_MX7) || defined(CONFIG_MX6ULL) || defined(CONFIG_MX6SLL) EPDC_UPD_CTRL_LUT_SEL_MASK = 0x3F0000, #else EPDC_UPD_CTRL_LUT_SEL_MASK = 0xF0000, @@ -331,7 +331,7 @@ enum { /* EPDC_AUTOWV_LUT field values */ EPDC_AUTOWV_LUT_DATA_MASK = 0xFF0000, EPDC_AUTOWV_LUT_DATA_OFFSET = 16, -#ifdef CONFIG_MX7 +#if defined(CONFIG_MX7) || defined(CONFIG_MX6ULL) || defined(CONFIG_MX6SLL) EPDC_AUTOWV_LUT_ADDR_MASK = 0x7, #else EPDC_AUTOWV_LUT_ADDR_MASK = 0xFF, |