diff options
| author | Tom Rini | 2019-06-10 09:41:19 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-06-10 09:41:19 -0400 |
| commit | 99e14d5249a1b46ec4a4321d6125449a8f09b549 (patch) | |
| tree | 6e5e4d72c8dbb4a542782514410c59181e0b1752 /include | |
| parent | eb53a18c9e903e35e8e8d52da96c33b63822881c (diff) | |
| parent | f944b15966d410fd81f6051a836f86d5263f617e (diff) | |
Merge tag 'video-updates-for-2019.07-rc3' of git://git.denx.de/u-boot-video
- mxsfb DM_VIDEO conversion
- splash fix for DM_VIDEO configurations
- meson HDMI fix for boards without hdmi-supply regulator
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/colibri_imx7.h | 2 | ||||
| -rw-r--r-- | include/splash.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 7dfc92c085b..c3b353b2c27 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -225,7 +225,7 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#ifdef CONFIG_VIDEO +#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN diff --git a/include/splash.h b/include/splash.h index 228aff441b8..7fd2de8fea1 100644 --- a/include/splash.h +++ b/include/splash.h @@ -66,10 +66,10 @@ void splash_get_pos(int *x, int *y); static inline void splash_get_pos(int *x, int *y) { } #endif -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD) -int lcd_splash(ulong addr); +#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +int splash_display(void); #else -static inline int lcd_splash(ulong addr) +static inline int splash_display(void) { return -ENOSYS; } |