diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-14 22:05:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-14 22:05:17 -0400 |
| commit | 3fea95369850987de15a2a0ac009d05e13b90246 (patch) | |
| tree | 1a850f39246c6980cb7f86c14215d25ed3f27e15 /include | |
| parent | fbeb33752999e7317113199ef89873d6b6916814 (diff) | |
| parent | 7682736c891d2b6f0cce167f4ecd55d2df0f562f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/colibri_vf.h | 13 | ||||
| -rw-r--r-- | include/configs/ls1021aqds.h | 4 | ||||
| -rw-r--r-- | include/configs/ls1021atwr.h | 4 | ||||
| -rw-r--r-- | include/fsl_dcu_fb.h | 1 |
4 files changed, 16 insertions, 6 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 73b43bd7adf..5dc5ed0b717 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -25,6 +25,17 @@ #define CONFIG_MXC_OCOTP #endif +#ifdef CONFIG_VIDEO_FSL_DCU_FB +#define CONFIG_CMD_BMP +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_LOGO +#define CONFIG_SYS_FSL_DCU_LE + +#define CONFIG_SYS_DCU_ADDR DCU0_BASE_ADDR +#define DCU_LAYER_MAX_NUM 64 +#endif + /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) @@ -130,6 +141,8 @@ "setupdate=run setsdupdate || run setusbupdate\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ + "video-mode=dcufb:640x480-16@60,monitor=lcd\0" \ + "splashpos=m,m\0" \ SD_BOOTCMD \ NFS_BOOTCMD \ UBI_BOOTCMD diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b349b367eb7..97b81274b05 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -421,9 +421,7 @@ unsigned long get_board_ddr_clk(void); /* * Video */ -#define CONFIG_FSL_DCU_FB - -#ifdef CONFIG_FSL_DCU_FB +#ifdef CONFIG_VIDEO_FSL_DCU_FB #define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index fcf035b86a3..a60b4b29902 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -300,9 +300,7 @@ /* * Video */ -#define CONFIG_FSL_DCU_FB - -#ifdef CONFIG_FSL_DCU_FB +#ifdef CONFIG_VIDEO_FSL_DCU_FB #define CONFIG_CMD_BMP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/fsl_dcu_fb.h b/include/fsl_dcu_fb.h index 42632984d35..67e29e74e62 100644 --- a/include/fsl_dcu_fb.h +++ b/include/fsl_dcu_fb.h @@ -9,6 +9,7 @@ int fsl_dcu_init(unsigned int xres, unsigned int yres, unsigned int pixel_format); +int fsl_dcu_fixedfb_setup(void *blob); /* Prototypes for external board-specific functions */ int platform_dcu_init(unsigned int xres, unsigned int yres, |