From dad631ccf720b78201e4b026422bb347fec64f5a Mon Sep 17 00:00:00 2001 From: Nikita Kiryanov Date: Thu, 20 Dec 2012 00:52:34 +0000 Subject: lcd: restore ability to display 8 bpp BMPs on 16 bpp LCDs Commit fb6a9aab7ae78c (LCD: display 32bpp decompressed bitmap image) broke the check that allowed U-Boot to display 8 bpp BMPs on a 16 bpp LCD screen, effectively turning this feature off. Restore this feature by changing the check back to the same meaning it originally had. To avoid future confusion, the check has also been rephrased to make its meaning clear. Signed-off-by: Nikita Kiryanov Signed-off-by: Igor Grinberg --- common/lcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/lcd.c') diff --git a/common/lcd.c b/common/lcd.c index 4778655a26..66d4f94f9e 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -888,7 +888,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } /* We support displaying 8bpp BMPs on 16bpp LCDs */ - if (bpix != bmp_bpix && (bmp_bpix != 8 || bpix != 16 || bpix != 32)) { + if (bpix != bmp_bpix && !(bmp_bpix == 8 && bpix == 16)) { printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", bpix, le16_to_cpu(bmp->header.bit_count)); -- cgit