From: Anatolij Gustschin <agust@denx.de>
Date: Sat, 12 Dec 2009 20:20:57 +0000 (+0100)
Subject: lcd: remove CONFIG_ATMEL_LCD ifdefs from lcd_setfgcolor
X-Git-Tag: v2010.03-rc1~97^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a6e42ed097220a82870a32f4e60ac8863a8b05ab;p=u-boot

lcd: remove CONFIG_ATMEL_LCD ifdefs from lcd_setfgcolor

Not all boards defining LCD_COLOR16 are able to set
lcd_color_fg/lcd_color_bg correctly. The issue seems to
be caused by CONFIG_ATMEL_LCD ifdefs in lcd_setfgcolor()
and lcd_setbgcolor(). Actually, the color values passed
to these functions are already correct, we don't need
to fix them. So remove ifdefs here.

Reported-by: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/common/lcd.c b/common/lcd.c
index 4e316183db..db799db6b2 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -456,22 +456,14 @@ ulong lcd_setmem (ulong addr)
 
 static void lcd_setfgcolor (int color)
 {
-#ifdef CONFIG_ATMEL_LCD
 	lcd_color_fg = color;
-#else
-	lcd_color_fg = color & 0x0F;
-#endif
 }
 
 /*----------------------------------------------------------------------*/
 
 static void lcd_setbgcolor (int color)
 {
-#ifdef CONFIG_ATMEL_LCD
 	lcd_color_bg = color;
-#else
-	lcd_color_bg = color & 0x0F;
-#endif
 }
 
 /*----------------------------------------------------------------------*/