summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2012-04-27 04:41:27 +0000
committerAnatolij Gustschin <agust@denx.de>2012-05-25 09:15:10 +0200
commit2b5cb3d33109a67ad25d74a98f1da92a1c637ee6 (patch)
treee50bc7485d8758b5871ed12d85bfb0f3bdbab128
parent0f999c49e5647ede23cfb1ee2b83da8d8a76297b (diff)
downloadu-boot-imx-2b5cb3d33109a67ad25d74a98f1da92a1c637ee6.zip
u-boot-imx-2b5cb3d33109a67ad25d74a98f1da92a1c637ee6.tar.gz
u-boot-imx-2b5cb3d33109a67ad25d74a98f1da92a1c637ee6.tar.bz2
common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef
Drop ifdef around bitmap_plot(). Signed-off-by: Anatolij Gustschin <agust@denx.de>
-rw-r--r--common/lcd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/lcd.c b/common/lcd.c
index ab78525..fe3545a 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;