GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2017-03-08 07:14:21 -05:00
commit 0574f786d3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/video/cfb_console.c
View file

@ -1079,8 +1079,8 @@ __weak void video_set_lut(unsigned int index, unsigned char r,
} }
#define FILL_32BIT_X888RGB(r,g,b) { \ #define FILL_32BIT_X888RGB(r,g,b) { \
*(unsigned long *)fb = \ *(u32 *)fb = \
SWAP32((unsigned long)(((r<<16) | \ SWAP32((unsigned int)(((r<<16) | \
(g<<8) | \ (g<<8) | \
b))); \ b))); \
fb += 4; \ fb += 4; \
@ -1161,7 +1161,7 @@ static void draw_bitmap(uchar **fb, uchar *bm, struct palette *p,
break; break;
case GDF_32BIT_X888RGB: case GDF_32BIT_X888RGB:
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
*(unsigned long *) addr = p[bm[*off]].ce.dw; *(u32 *) addr = p[bm[*off]].ce.dw;
addr += 4; addr += 4;
} }
break; break;
@ -1825,8 +1825,8 @@ static void plot_logo_or_black(void *screen, int x, int y, int black)
(b >> 3))); (b >> 3)));
break; break;
case GDF_32BIT_X888RGB: case GDF_32BIT_X888RGB:
*(unsigned long *) dest = *(u32 *) dest =
SWAP32((unsigned long) ( SWAP32((u32) (
(r << 16) | (r << 16) |
(g << 8) | (g << 8) |
b)); b));