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

lcd: mpc823: move mpc823-specific lcd_logo_set_cmap code to mpc8xx_lcd.c

Browse source 
Reduce the bitmap_plot #ifdef complexity by extracting MPC823-specific code for
setting cmap into its own implementation of lcd_logo_set_cmap(), implemented in
mpc8xx_lcd.c. In the MPC823 implementation, ARRAY_SIZE(bmp_logo_palette) is
switched for BMP_LOGO_COLORS to avoid having to include bmp_logo_data.h, which
would cause a compilation error because the logo data and palette arrays would
be defined twice.

This is a step towards cleaning bitmap_plot() of platform-specific code.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Bo Shen <voice.shen@atmel.com>
Tested-by: Josh Wu <josh.wu@atmel.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Nikita Kiryanov 2015-02-03 13:32:25 +02:00 • committed by Anatolij Gustschin
parent a02e948139
commit 0ee261f6d3
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/lcd.c
View file

@ -396,10 +396,6 @@ void bitmap_plot(int x, int y)
uchar *bmap; uchar *bmap;
uchar *fb; uchar *fb;
ushort *fb16; ushort *fb16;
#if defined(CONFIG_MPC823)
immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
cpm8xx_t *cp = &(immr->im_cpm);
#endif
unsigned bpix = NBITS(panel_info.vl_bpix); unsigned bpix = NBITS(panel_info.vl_bpix);
debug("Logo: width %d height %d colors %d cmap %d\n", debug("Logo: width %d height %d colors %d cmap %d\n",
@ -415,16 +411,12 @@ void bitmap_plot(int x, int y)
* cmap was set to the source palette, so no change is done. * cmap was set to the source palette, so no change is done.
* This avoids even more ifdefs in the next stanza * This avoids even more ifdefs in the next stanza
*/ */
#if defined(CONFIG_MPC823)
cmap = (ushort *) &(cp->lcd_cmap[BMP_LOGO_OFFSET * sizeof(ushort)]);
#else
cmap = configuration_get_cmap(); cmap = configuration_get_cmap();
#endif
WATCHDOG_RESET(); WATCHDOG_RESET();
/* Set color map */ /* Set color map */
#ifdef CONFIG_ATMEL_LCD #if defined(CONFIG_ATMEL_LCD) || defined(CONFIG_MPC823)
lcd_logo_set_cmap(); lcd_logo_set_cmap();
#else #else
for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) { for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) {

15
drivers/video/mpc8xx_lcd.c
View file

@ -371,6 +371,21 @@ void fb_put_byte(uchar **fb, uchar **from)
} }
#endif #endif
#ifdef CONFIG_LCD_LOGO
#include <bmp_logo.h>
void lcd_logo_set_cmap(void)
{
int i;
ushort *cmap;
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
cpm8xx_t *cp = &(immr->im_cpm);
cmap = (ushort *)&(cp->lcd_cmap[BMP_LOGO_OFFSET * sizeof(ushort)]);
for (i = 0; i < BMP_LOGO_COLORS; ++i)
*cmap++ = bmp_logo_palette[i];
}
#endif
void lcd_enable (void) void lcd_enable (void)
{ {
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;