[U-Boot] [PATCH] video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP

[Simon Glass]

On 28 April 2017 at 09:13, Philipp Tomsich
<philipp.tomsich at theobroma-systems.com> wrote:
> Due to a typo, the 24 bit-per-pixel configuration ends in 24BMP
> instead of 24BPP. This change renames it throughout the source tree
> for consistency and to make moving these options into Kconfig easier
> and less error-prone.
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
> ---
>
>  common/lcd.c                 | 4 ++--
>  drivers/video/video_bmp.c    | 4 ++--
>  include/configs/brxre1.h     | 2 +-
>  scripts/config_whitelist.txt | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
>

Reviewed-by: Simon Glass <sjg at chromium.org>

Please see below.

> diff --git a/common/lcd.c b/common/lcd.c
> index 783626e..2405146 100644
> --- a/common/lcd.c
> +++ b/common/lcd.c
> @@ -704,7 +704,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
>                 }
>                 break;
>  #endif /* CONFIG_BMP_16BPP */
> -#if defined(CONFIG_BMP_24BMP)
> +#if defined(CONFIG_BMP_24BPP)
>         case 24:
>                 for (i = 0; i < height; ++i) {
>                         for (j = 0; j < width; j++) {
> @@ -716,7 +716,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
>                         fb -= lcd_line_length + width * (bpix / 8);
>                 }
>                 break;
> -#endif /* CONFIG_BMP_24BMP */
> +#endif /* CONFIG_BMP_24BPP */
>  #if defined(CONFIG_BMP_32BPP)
>         case 32:
>                 for (i = 0; i < height; ++i) {
> diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
> index 32a4e7f..f803067 100644
> --- a/drivers/video/video_bmp.c
> +++ b/drivers/video/video_bmp.c
> @@ -316,7 +316,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
>                 }
>                 break;
>  #endif /* CONFIG_BMP_16BPP */
> -#if defined(CONFIG_BMP_24BMP)
> +#if defined(CONFIG_BMP_24BPP)
>         case 24:
>                 for (i = 0; i < height; ++i) {
>                         for (j = 0; j < width; j++) {
> @@ -328,7 +328,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
>                         fb -= priv->line_length + width * (bpix / 8);
>                 }
>                 break;
> -#endif /* CONFIG_BMP_24BMP */
> +#endif /* CONFIG_BMP_24BPP */
>  #if defined(CONFIG_BMP_32BPP)
>         case 32:
>                 for (i = 0; i < height; ++i) {
> diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
> index 82ee7c6..6cd166a 100644
> --- a/include/configs/brxre1.h
> +++ b/include/configs/brxre1.h
> @@ -23,7 +23,7 @@
>  #define CONFIG_VIDEO_BMP_GZIP
>  #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4)
>  #define CONFIG_CMD_BMP
> -#define CONFIG_BMP_24BMP
> +#define CONFIG_BMP_24BPP
>  #define CONFIG_BMP_32BPP
>
>  /* memory */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 5e515d2..59fa89d 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -247,7 +247,7 @@ CONFIG_BL1_SIZE
>  CONFIG_BL2_OFFSET
>  CONFIG_BL2_SIZE
>  CONFIG_BMP_16BPP
> -CONFIG_BMP_24BMP
> +CONFIG_BMP_24BPP

Do we need to add this?

>  CONFIG_BMP_24BPP
>  CONFIG_BMP_32BPP
>  CONFIG_BOARDDIR
> --
> 1.9.1
>