dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

include: Enable video related global data variable and splash at SPL

Browse Source 
To include video related global data variables and splash functions at
SPL and u-boot proper, use CONFIG_IS_ENABLED.

Replace CONFIG_CMD_BMP with CONFIG_BMP to enable splash_display function
at u-boot proper and SPL.

Signed-off-by: Nikhil M Jain <n-jain1@ti.com>
Reviewed-by: Devarsh Thakkar <devarsht@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Nikhil M Jain
2023-04-20 17:41:10 +05:30
committed by Anatolij Gustschin
parent eb9217dc03
commit 25127ea388
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm-generic/global_data.h
View File

@@ -68,7 +68,7 @@ struct global_data {
* @mem_clk: memory clock rate in Hz * @mem_clk: memory clock rate in Hz
*/ */
unsigned long mem_clk; unsigned long mem_clk;
#if defined(CONFIG_VIDEO) #if CONFIG_IS_ENABLED(VIDEO)
/** /**
* @fb_base: base address of frame buffer memory * @fb_base: base address of frame buffer memory
*/ */
@@ -359,7 +359,7 @@ struct global_data {
*/ */
struct membuff console_in; struct membuff console_in;
#endif #endif
#ifdef CONFIG_VIDEO #if CONFIG_IS_ENABLED(VIDEO)
/** /**
* @video_top: top of video frame buffer area * @video_top: top of video frame buffer area
*/ */

6
include/splash.h
View File

@@ -49,7 +49,7 @@ struct splash_location {
char *ubivol; /* UBI volume-name for ubifsmount */ 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); int splash_source_load(struct splash_location *locations, uint size);
#else #else
static inline int splash_source_load(struct splash_location *locations, static inline int splash_source_load(struct splash_location *locations,
@@ -61,13 +61,13 @@ static inline int splash_source_load(struct splash_location *locations,
int splash_screen_prepare(void); int splash_screen_prepare(void);
#ifdef CONFIG_SPLASH_SCREEN_ALIGN #if CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN)
void splash_get_pos(int *x, int *y); void splash_get_pos(int *x, int *y);
#else #else
static inline void splash_get_pos(int *x, int *y) { } static inline void splash_get_pos(int *x, int *y) { }
#endif #endif
#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) #if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(BMP)
int splash_display(void); int splash_display(void);
#else #else
static inline int splash_display(void) static inline int splash_display(void)