[PATCH V5 12/13] include: Enable video related global data variable and splash at SPL

[Devarsh Thakkar]

Hi,

On 03/04/23 13:44, Nikhil M Jain wrote:
> To include video related global data variables and splash functions at
> SPL, use CONFIG_IS_ENABLED.

s/at SPL/at both SPL and u-boot proper
> 
> 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 at ti.com>

After above change,
Reviewed-by: Devarsh Thakkar <devarsht at ti.com>

Regards
Devarsh
> ---
> V5:
> - Replace CONFIG_CMD_BMP with CONFIG_BMP.
> 
> 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 987fb66c17..65bf8df1e5 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..b6a100ffc3 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) && CONFIG_IS_ENABLED(BMP)
>  int splash_display(void);
>  #else
>  static inline int splash_display(void)