leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse Source
This commit is contained in:
Tom Rini 2013-01-14 15:41:38 -07:00
commit 981481958f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README
View File

@ -2714,10 +2714,13 @@ FIT uImage format:
CONFIG_FB_ADDR CONFIG_FB_ADDR
Define CONFIG_FB_ADDR if you want to use specific Define CONFIG_FB_ADDR if you want to use specific
address for frame buffer. address for frame buffer. This is typically the case
Then system will reserve the frame buffer address to when using a graphics controller has separate video
defined address instead of lcd_setmem (this function memory. U-Boot will then place the frame buffer at
grabs the memory for frame buffer by panel's size). 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. Please see board_init_f function.

2
common/lcd.c
View File

@ -888,7 +888,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
} }
/* We support displaying 8bpp BMPs on 16bpp LCDs */ /* 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", printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
bpix, bpix,
le16_to_cpu(bmp->header.bit_count)); le16_to_cpu(bmp->header.bit_count));