From 2b5cb3d33109a67ad25d74a98f1da92a1c637ee6 Mon Sep 17 00:00:00 2001
From: Anatolij Gustschin <agust@denx.de>
Date: Fri, 27 Apr 2012 04:41:27 +0000
Subject: [PATCH] common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef
Drop ifdef around bitmap_plot().
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
common/lcd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/lcd.c b/common/lcd.c
index ab78525d17..fe3545a7e8 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -594,6 +594,8 @@ void bitmap_plot (int x, int y)
WATCHDOG_RESET();
}
+#else
+static inline void bitmap_plot(int x, int y) {}
#endif /* CONFIG_LCD_LOGO */
/*----------------------------------------------------------------------*/
@@ -839,9 +841,7 @@ static void *lcd_logo (void)
}
#endif /* CONFIG_SPLASH_SCREEN */
-#ifdef CONFIG_LCD_LOGO
- bitmap_plot (0, 0);
-#endif /* CONFIG_LCD_LOGO */
+ bitmap_plot(0, 0);
#ifdef CONFIG_LCD_INFO
console_col = LCD_INFO_X / VIDEO_FONT_WIDTH;
--
2.39.5