Acked-by: Nikita Kiryanov nikita@compulab.co.il
On 09/22/2012 07:55 PM, Anatolij Gustschin wrote:
Commit 203c37b8c5556aad1901ce4954792afd718c7d42 (common lcd: simplify core functions)
and commit bfdcc65e1163b4891643c2a670570c478b9af2a4 (common lcd: simplify lcd_display_bitmap)
caused build breakage for at91sam9x5ek board configurations and for trats board. Fix these build errors.
Signed-off-by: Anatolij Gustschin agust@denx.de
common/lcd.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/common/lcd.c b/common/lcd.c index fcc09ac..b6be800 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -509,8 +509,14 @@ static inline ushort *configuration_get_cmap(void) return (ushort *)&(cp->lcd_cmap[255 * sizeof(ushort)]); #elif defined(CONFIG_ATMEL_LCD) return (ushort *)(panel_info.mmio + ATMEL_LCDC_LUT(0)); +#elif !defined(CONFIG_ATMEL_HLCD) && !defined(CONFIG_EXYNOS_FB)
- return panel_info.cmap; #else
- return (ushort *)panel_info.cmap;
+#if defined(CONFIG_LCD_LOGO)
- return bmp_logo_palette;
+#else
- return NULL;
+#endif #endif }
@@ -636,10 +642,10 @@ static void splash_align_axis(int *axis, unsigned long panel_size, } #endif
-#if defined CONFIG_CPU_PXA || defined(CONFIG_ATMEL_LCD) -#define FB_PUT_BYTE(fb, from) *(fb)++ = *(from)++ -#elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200) +#if defined(CONFIG_MPC823) || defined(CONFIG_MCC200) #define FB_PUT_BYTE(fb, from) *(fb)++ = (255 - *(from)++) +#else +#define FB_PUT_BYTE(fb, from) *(fb)++ = *(from)++ #endif
#if defined(CONFIG_BMP_16BPP)