summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2014-12-08 17:14:35 +0200
committerAnatolij Gustschin <agust@denx.de>2015-01-10 17:45:00 +0100
commitdc6b5b3a15bd309f818420c1e564b0f5b9b19a3d (patch)
treebb66b7e466572609279ba4eb38de08a58019f515
parent4c8c485ad9249e1ca1822474954b78799ca937e9 (diff)
downloadu-boot-imx-dc6b5b3a15bd309f818420c1e564b0f5b9b19a3d.zip
u-boot-imx-dc6b5b3a15bd309f818420c1e564b0f5b9b19a3d.tar.gz
u-boot-imx-dc6b5b3a15bd309f818420c1e564b0f5b9b19a3d.tar.bz2
lcd: remove CONFIG_SYS_INVERT_COLORS
No one is using CONFIG_SYS_INVERT_COLORS; remove related code. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Simon Glass <sjg@chromium.org> Cc: Anatolij Gustschin <agust@denx.de> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/lcd.c8
-rw-r--r--drivers/video/mpc8xx_lcd.c4
2 files changed, 1 insertions, 11 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 3ed504d..70b848c 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -685,11 +685,7 @@ void bitmap_plot(int x, int y)
*(cmap + BMP_LOGO_OFFSET) = lut_entry;
cmap++;
#else /* !CONFIG_ATMEL_LCD */
-#ifdef CONFIG_SYS_INVERT_COLORS
- *cmap++ = 0xffff - colreg;
-#else
*cmap++ = colreg;
-#endif
#endif /* CONFIG_ATMEL_LCD */
}
@@ -967,11 +963,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
( ((cte.red) << 8) & 0xf800) |
( ((cte.green) << 3) & 0x07e0) |
( ((cte.blue) >> 3) & 0x001f) ;
-#ifdef CONFIG_SYS_INVERT_COLORS
- *cmap = 0xffff - colreg;
-#else
*cmap = colreg;
-#endif
#if defined(CONFIG_MPC823)
cmap--;
#else
diff --git a/drivers/video/mpc8xx_lcd.c b/drivers/video/mpc8xx_lcd.c
index 50eed89..7234621 100644
--- a/drivers/video/mpc8xx_lcd.c
+++ b/drivers/video/mpc8xx_lcd.c
@@ -373,9 +373,7 @@ lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue)
colreg = ((red & 0x0F) << 8) |
((green & 0x0F) << 4) |
(blue & 0x0F) ;
-#ifdef CONFIG_SYS_INVERT_COLORS
- colreg ^= 0x0FFF;
-#endif
+
*cmap_ptr = colreg;
debug ("setcolreg: reg %2d @ %p: R=%02X G=%02X B=%02X => %02X%02X\n",