| Message ID | 20230329120119.72886-14-n-jain1@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
| Series | Add splash screen support at u-boot SPL | expand |
Hi Nikhil Thanks for the patch, On 29/03/23 17:31, Nikhil M Jain wrote: > To include video related global data variables and splash functions at > SPL, use CONFIG_IS_ENABLED. > > Signed-off-by: Nikhil M Jain <n-jain1@ti.com> > --- > V4: > - No change > > V3 (patch introduced): > - Include video related global data variables > - Include splash display functions > > include/asm-generic/global_data.h | 4 ++-- > include/splash.h | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h > index da17ac8cbc..bad9f9382e 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 33e45e6941..6adde9148c 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, > @@ -61,13 +61,13 @@ static inline int splash_source_load(struct splash_location *locations, > > 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); > #else > static inline void splash_get_pos(int *x, int *y) { } > #endif > > -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) > +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) Same comment as previous patch, don't you need CONFIG_SPL_BMP ? > int splash_display(void); > #else > static inline int splash_display(void)
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index da17ac8cbc..bad9f9382e 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 33e45e6941..6adde9148c 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, @@ -61,13 +61,13 @@ static inline int splash_source_load(struct splash_location *locations, 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); #else static inline void splash_get_pos(int *x, int *y) { } #endif -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) int splash_display(void); #else static inline int splash_display(void)
To include video related global data variables and splash functions at SPL, use CONFIG_IS_ENABLED. Signed-off-by: Nikhil M Jain <n-jain1@ti.com> --- V4: - No change V3 (patch introduced): - Include video related global data variables - Include splash display functions include/asm-generic/global_data.h | 4 ++-- include/splash.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)