video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP

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@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
master
Philipp Tomsich 7 years ago committed by Anatolij Gustschin
parent 8517f64fe6
commit 10ba6b3339
  1. 4
      common/lcd.c
  2. 4
      drivers/video/video_bmp.c
  3. 2
      include/configs/brxre1.h
  4. 1
      scripts/config_whitelist.txt

@ -704,7 +704,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
} }
break; break;
#endif /* CONFIG_BMP_16BPP */ #endif /* CONFIG_BMP_16BPP */
#if defined(CONFIG_BMP_24BMP) #if defined(CONFIG_BMP_24BPP)
case 24: case 24:
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {
for (j = 0; j < width; j++) { 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); fb -= lcd_line_length + width * (bpix / 8);
} }
break; break;
#endif /* CONFIG_BMP_24BMP */ #endif /* CONFIG_BMP_24BPP */
#if defined(CONFIG_BMP_32BPP) #if defined(CONFIG_BMP_32BPP)
case 32: case 32:
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {

@ -316,7 +316,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
} }
break; break;
#endif /* CONFIG_BMP_16BPP */ #endif /* CONFIG_BMP_16BPP */
#if defined(CONFIG_BMP_24BMP) #if defined(CONFIG_BMP_24BPP)
case 24: case 24:
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {
for (j = 0; j < width; j++) { 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); fb -= priv->line_length + width * (bpix / 8);
} }
break; break;
#endif /* CONFIG_BMP_24BMP */ #endif /* CONFIG_BMP_24BPP */
#if defined(CONFIG_BMP_32BPP) #if defined(CONFIG_BMP_32BPP)
case 32: case 32:
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {

@ -21,7 +21,7 @@
#define CONFIG_VIDEO_BMP_GZIP #define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4)
#define CONFIG_BMP_24BMP #define CONFIG_BMP_24BPP
#define CONFIG_BMP_32BPP #define CONFIG_BMP_32BPP
/* memory */ /* memory */

@ -236,7 +236,6 @@ CONFIG_BL1_SIZE
CONFIG_BL2_OFFSET CONFIG_BL2_OFFSET
CONFIG_BL2_SIZE CONFIG_BL2_SIZE
CONFIG_BMP_16BPP CONFIG_BMP_16BPP
CONFIG_BMP_24BMP
CONFIG_BMP_24BPP CONFIG_BMP_24BPP
CONFIG_BMP_32BPP CONFIG_BMP_32BPP
CONFIG_BOARDDIR CONFIG_BOARDDIR

Loading…
Cancel
Save