diff options
author | wdenk <wdenk> | 2004-12-10 11:40:40 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-12-10 11:40:40 +0000 |
commit | 25d6712a81b31fc5e4c4bddd81e9aaddb84e23be (patch) | |
tree | f7288050682512d5ba263ce1ff565d6225976402 /common/lcd.c | |
parent | ed54e6212518262d27abe5e6de3c608d5ebceafb (diff) | |
download | u-boot-imx-25d6712a81b31fc5e4c4bddd81e9aaddb84e23be.zip u-boot-imx-25d6712a81b31fc5e4c4bddd81e9aaddb84e23be.tar.gz u-boot-imx-25d6712a81b31fc5e4c4bddd81e9aaddb84e23be.tar.bz2 |
* Clean up CMC PU2 flash driver
* Update MAINTAINERS file
* Fix bug in MPC823 LCD driver
Diffstat (limited to 'common/lcd.c')
-rw-r--r-- | common/lcd.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/common/lcd.c b/common/lcd.c index 85b44ca..d3ecd92 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -620,6 +620,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) cmap = (ushort *)fbi->palette; #elif defined(CONFIG_MPC823) cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]); +#else +# error "Don't know location of color map" #endif /* Set color map */ @@ -631,9 +633,14 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) ( (cte.blue) & 0x001f) ; #ifdef CFG_INVERT_COLORS - *cmap++ = 0xffff - colreg; + *cmap = 0xffff - colreg; #else - *cmap++ = colreg; + *cmap = colreg; +#endif +#if defined(CONFIG_PXA250) + cmap++; +#elif defined(CONFIG_MPC823) + cmap--; #endif } } |