| Message ID | 1494013716-25091-6-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Accepted |
| Commit | 10ba6b333955b7be491f9dd8c1241309dfcb5c8b |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
On Fri, 5 May 2017 21:48:30 +0200 Philipp Tomsich philipp.tomsich@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@theobroma-systems.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> > --- > > Changes in v3: None > Changes in v2: > - rebase to master after CMD_BMP was migrated to Kconfig > - don't device CONFIG_BMP_24BPP twice in config_whitelist (apparently > there had been both the _24BPP and the _24BMP whitelisted before and > I didn't even spot it ... thanks go to Simon for catching this) > > common/lcd.c | 4 ++-- > drivers/video/video_bmp.c | 4 ++-- > include/configs/brxre1.h | 2 +- > scripts/config_whitelist.txt | 1 - > 4 files changed, 5 insertions(+), 6 deletions(-) applied to u-boot-video/master, thanks! -- Anatolij
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 49f223a..9984689 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -21,7 +21,7 @@ #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) -#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 ed349b9..558e7ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -236,7 +236,6 @@ CONFIG_BL1_SIZE CONFIG_BL2_OFFSET CONFIG_BL2_SIZE CONFIG_BMP_16BPP -CONFIG_BMP_24BMP CONFIG_BMP_24BPP CONFIG_BMP_32BPP CONFIG_BOARDDIR