public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] lcd: Fix build error with CONFIG_LCD_BMP_RLE8
@ 2014-10-15 10:53 Simon Glass
  2014-10-16  9:15 ` Anatolij Gustschin
  0 siblings, 1 reply; 2+ messages in thread
From: Simon Glass @ 2014-10-15 10:53 UTC (permalink / raw)
  To: u-boot

Add a block to avoid a build error with the variable declaration.
Enable the option on sandbox to prevent an error being introduced in
future.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 common/lcd.c              | 4 ++--
 include/configs/sandbox.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lcd.c b/common/lcd.c
index 217ec9d..689d30e 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -1023,7 +1023,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 
 	switch (bmp_bpix) {
 	case 1: /* pass through */
-	case 8:
+	case 8: {
 #ifdef CONFIG_LCD_BMP_RLE8
 		u32 compression = get_unaligned_le32(&bmp->header.compression);
 		if (compression == BMP_BI_RLE8) {
@@ -1056,7 +1056,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 			fb -= byte_width + lcd_line_length;
 		}
 		break;
-
+	}
 #if defined(CONFIG_BMP_16BPP)
 	case 16:
 		for (i = 0; i < height; ++i) {
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 6972643..022629f 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -172,6 +172,7 @@
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define LCD_BPP			LCD_COLOR16
+#define CONFIG_LCD_BMP_RLE8
 
 #define CONFIG_CROS_EC_KEYB
 #define CONFIG_KEYBOARD
-- 
2.1.0.rc2.206.gedb03e5

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] lcd: Fix build error with CONFIG_LCD_BMP_RLE8
  2014-10-15 10:53 [U-Boot] [PATCH] lcd: Fix build error with CONFIG_LCD_BMP_RLE8 Simon Glass
@ 2014-10-16  9:15 ` Anatolij Gustschin
  0 siblings, 0 replies; 2+ messages in thread
From: Anatolij Gustschin @ 2014-10-16  9:15 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Wed, 15 Oct 2014 04:53:04 -0600
Simon Glass <sjg@chromium.org> wrote:

> Add a block to avoid a build error with the variable declaration.
> Enable the option on sandbox to prevent an error being introduced in
> future.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> 
>  common/lcd.c              | 4 ++--
>  include/configs/sandbox.h | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)

Applied to u-boot-video/master.

Thanks,

Anatolij

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-10-16  9:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-15 10:53 [U-Boot] [PATCH] lcd: Fix build error with CONFIG_LCD_BMP_RLE8 Simon Glass
2014-10-16  9:15 ` Anatolij Gustschin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox