summaryrefslogtreecommitdiff
path: root/common/lcd.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-07-17 10:41:06 +0200
committerStefan Roese <sr@denx.de>2008-07-17 10:41:06 +0200
commit42246dacf60d5028d3a48a220ce94efcf56faec4 (patch)
tree52613a7ee19d68700426c8e7d7504346daa0f7f3 /common/lcd.c
parent11188d55bc16dd907451c00282e00a038f73dd62 (diff)
parent699f05125509249072a0b865c8d35520d97cd501 (diff)
downloadu-boot-imx-42246dacf60d5028d3a48a220ce94efcf56faec4.zip
u-boot-imx-42246dacf60d5028d3a48a220ce94efcf56faec4.tar.gz
u-boot-imx-42246dacf60d5028d3a48a220ce94efcf56faec4.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'common/lcd.c')
-rw-r--r--common/lcd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/lcd.c b/common/lcd.c
index ebf377a..eec1f53 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -539,7 +539,7 @@ void bitmap_plot (int x, int y)
debug ("Logo: width %d height %d colors %d cmap %d\n",
BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS,
- sizeof(bmp_logo_palette)/(sizeof(ushort)));
+ (int)(sizeof(bmp_logo_palette)/(sizeof(ushort))));
bmap = &bmp_logo_bitmap[0];
fb = (uchar *)(lcd_base + y * lcd_line_length + x);
@@ -728,7 +728,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
WATCHDOG_RESET();
for (j = 0; j < width ; j++)
#if defined(CONFIG_PXA250)
- *(fb++)=*(bmap++);
+ *(fb++) = *(bmap++);
#elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200)
*(fb++)=255-*(bmap++);
#endif