summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-09-22 09:46:19 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-09-22 09:46:19 +0200
commita6e6cf00367c0779eadb49915e40c55f0a787957 (patch)
tree9f24bd7dbdb90453300c0267200e4ea2b18194c1 /common
parent1caa70788c5a936197e3ecbbdc7c7c629fd44a7f (diff)
parent8b4c9e7c144397f483d23c002dcd9c59ff7c2395 (diff)
downloadu-boot-imx-a6e6cf00367c0779eadb49915e40c55f0a787957.zip
u-boot-imx-a6e6cf00367c0779eadb49915e40c55f0a787957.tar.gz
u-boot-imx-a6e6cf00367c0779eadb49915e40c55f0a787957.tar.bz2
Merge with /home/wd/git/u-boot/work
Diffstat (limited to 'common')
-rw-r--r--common/lcd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/lcd.c b/common/lcd.c
index a85599d..7bf7a63 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -638,9 +638,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
bmp_color_table_entry_t cte = bmp->color_table[i];
ushort colreg =
( ((cte.red) << 8) & 0xf800) |
- ( ((cte.green) << 4) & 0x07e0) |
- ( (cte.blue) & 0x001f) ;
-
+ ( ((cte.green) << 3) & 0x07e0) |
+ ( ((cte.blue) >> 3) & 0x001f) ;
#ifdef CFG_INVERT_COLORS
*cmap = 0xffff - colreg;
#else