diff options
| author | Tom Rini | 2023-05-05 09:36:08 -0400 |
|---|---|---|
| committer | Tom Rini | 2023-05-05 09:36:08 -0400 |
| commit | ab75996ba49c140c529f14b5c40d0d16430feefb (patch) | |
| tree | acedbf783e9db8b8b7d0adadb3aa14565d7c646b /include | |
| parent | eb59ece5204fe06bd037fe64944bfbb3b85864ea (diff) | |
| parent | def72d5c6265bde4e9eb7976db53a77fabc4808a (diff) | |
Merge tag 'video-for-v2023.07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-video
- enable video support in SPL
- support splash screen for TI am62x
- replace #ifdef and #if with if's in bmp/splash
- add lm3533 backlight driver
- add Solomon SSD2825 DSI/LVDS bridge driver
- add Renesas R61307 and R69328 MIPI DSI panel drivers
- add tegra DC based PWM backlight driver
- add generic endeavoru (HTC One X) panel driver
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/global_data.h | 4 | ||||
| -rw-r--r-- | include/splash.h | 15 | ||||
| -rw-r--r-- | include/video.h | 8 |
3 files changed, 11 insertions, 16 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 987fb66c17a..65bf8df1e56 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -68,7 +68,7 @@ struct global_data { * @mem_clk: memory clock rate in Hz */ unsigned long mem_clk; -#if defined(CONFIG_VIDEO) +#if CONFIG_IS_ENABLED(VIDEO) /** * @fb_base: base address of frame buffer memory */ @@ -359,7 +359,7 @@ struct global_data { */ struct membuff console_in; #endif -#ifdef CONFIG_VIDEO +#if CONFIG_IS_ENABLED(VIDEO) /** * @video_top: top of video frame buffer area */ diff --git a/include/splash.h b/include/splash.h index 33e45e69416..c3922375987 100644 --- a/include/splash.h +++ b/include/splash.h @@ -49,7 +49,7 @@ struct splash_location { char *ubivol; /* UBI volume-name for ubifsmount */ }; -#ifdef CONFIG_SPLASH_SOURCE +#if CONFIG_IS_ENABLED(SPLASH_SOURCE) int splash_source_load(struct splash_location *locations, uint size); #else static inline int splash_source_load(struct splash_location *locations, @@ -60,21 +60,8 @@ static inline int splash_source_load(struct splash_location *locations, #endif int splash_screen_prepare(void); - -#ifdef CONFIG_SPLASH_SCREEN_ALIGN void splash_get_pos(int *x, int *y); -#else -static inline void splash_get_pos(int *x, int *y) { } -#endif - -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) int splash_display(void); -#else -static inline int splash_display(void) -{ - return -ENOSYS; -} -#endif #define BMP_ALIGN_CENTER 0x7FFF diff --git a/include/video.h b/include/video.h index 4d99e5dc27f..29c4f51efb0 100644 --- a/include/video.h +++ b/include/video.h @@ -357,4 +357,12 @@ void *video_get_u_boot_logo(void); */ int bmp_display(ulong addr, int x, int y); +/* + * bmp_info() - Show information about bmp file + * + * @addr: address of bmp file + * Returns: 0 if OK, else 1 if bmp image not found + */ +int bmp_info(ulong addr); + #endif |