aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-01-14 15:41:38 -0700
committerTom Rini <trini@ti.com>2013-01-14 15:41:38 -0700
commit981481958f98f17089bd3d776f71599756d9b9bd (patch)
tree2b6e34258221bb953f9c45c1f1acf4de7129b2d3
parentf1972e32559e34290f13654859264da331795ea5 (diff)
parent44a53b57439dc1f117135b4f8c22d25915096164 (diff)
downloadu-boot-linaro-stable-981481958f98f17089bd3d776f71599756d9b9bd.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-video
-rw-r--r--README11
-rw-r--r--common/lcd.c2
2 files changed, 8 insertions, 5 deletions
diff --git a/README b/README
index 8707bf2d7..a33647623 100644
--- a/README
+++ b/README
@@ -2714,10 +2714,13 @@ FIT uImage format:
CONFIG_FB_ADDR
Define CONFIG_FB_ADDR if you want to use specific
- address for frame buffer.
- Then system will reserve the frame buffer address to
- defined address instead of lcd_setmem (this function
- grabs the memory for frame buffer by panel's size).
+ address for frame buffer. This is typically the case
+ when using a graphics controller has separate video
+ memory. U-Boot will then place the frame buffer at
+ the given address instead of dynamically reserving it
+ in system RAM by calling lcd_setmem(), which grabs
+ the memory for the frame buffer depending on the
+ configured panel size.
Please see board_init_f function.
diff --git a/common/lcd.c b/common/lcd.c
index 4778655a2..66d4f94f9 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));