diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-08 07:14:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-08 07:14:21 -0500 |
| commit | 0574f786d3c85ab1a9fe9ee8ade65e3ae83e18a4 (patch) | |
| tree | 0e77909b0e20a06e67b59beca27826ba8502e81b /drivers | |
| parent | 866bd1cc737ebb9621e72acd5a5d57c0b6ecd2d2 (diff) | |
| parent | 1d4ed26fafb4250a1a9f9aba55de05062330ea5b (diff) | |
| download | u-boot-imx-0574f786d3c85ab1a9fe9ee8ade65e3ae83e18a4.zip u-boot-imx-0574f786d3c85ab1a9fe9ee8ade65e3ae83e18a4.tar.gz u-boot-imx-0574f786d3c85ab1a9fe9ee8ade65e3ae83e18a4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/cfb_console.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 3c0696e..d75abb6 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1079,8 +1079,8 @@ __weak void video_set_lut(unsigned int index, unsigned char r, } #define FILL_32BIT_X888RGB(r,g,b) { \ - *(unsigned long *)fb = \ - SWAP32((unsigned long)(((r<<16) | \ + *(u32 *)fb = \ + SWAP32((unsigned int)(((r<<16) | \ (g<<8) | \ b))); \ fb += 4; \ @@ -1161,7 +1161,7 @@ static void draw_bitmap(uchar **fb, uchar *bm, struct palette *p, break; case GDF_32BIT_X888RGB: for (i = 0; i < cnt; i++) { - *(unsigned long *) addr = p[bm[*off]].ce.dw; + *(u32 *) addr = p[bm[*off]].ce.dw; addr += 4; } break; @@ -1825,8 +1825,8 @@ static void plot_logo_or_black(void *screen, int x, int y, int black) (b >> 3))); break; case GDF_32BIT_X888RGB: - *(unsigned long *) dest = - SWAP32((unsigned long) ( + *(u32 *) dest = + SWAP32((u32) ( (r << 16) | (g << 8) | b)); |