aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAjay Kumar <ajaykumar.rs@samsung.com>2013-01-13 23:32:16 +0000
committerMinkyu Kang <mk7.kang@samsung.com>2013-01-14 19:17:28 +0900
commite4660e0b7363cdc86519f4af2143b841592a7ffd (patch)
tree591c600d89398d3cfbeed73ef9b180c46231c0ec
parent02a58b934036dfaa74afb61d383771eda444642b (diff)
downloadu-boot-linaro-stable-e4660e0b7363cdc86519f4af2143b841592a7ffd.tar.gz
video: exynos_fb: Make a call to draw_logo only when CONFIG_CMD_BMP is selected
Previously, the call to draw_logo() was happening irrespective of whether we have selected logo or LCD console. With this patch we call draw_logo() only when CONFIG_CMD_BMP is selected. This would even fix the following compilation warning: exynos_fb.c: In function 'draw_logo': exynos_fb.c:74:8: warning: variable 'addr' set but not used [-Wunused-but-set-variable] exynos_fb.c:73:9: warning: variable 'y' set but not used [-Wunused-but-set-variable] exynos_fb.c:73:6: warning: variable 'x' set but not used [-Wunused-but-set-variable] Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--drivers/video/exynos_fb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c
index 183bca07c..ee0ed06d6 100644
--- a/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@ -68,6 +68,7 @@ static void exynos_lcd_init(vidinfo_t *vid)
lcd_set_flush_dcache(1);
}
+#ifdef CONFIG_CMD_BMP
static void draw_logo(void)
{
int x, y;
@@ -88,10 +89,9 @@ static void draw_logo(void)
}
addr = panel_info.logo_addr;
-#ifdef CONFIG_CMD_BMP
bmp_display(addr, x, y);
-#endif
}
+#endif
static void lcd_panel_on(vidinfo_t *vid)
{
@@ -150,7 +150,9 @@ void lcd_enable(void)
if (panel_info.logo_on) {
memset(lcd_base, 0, panel_width * panel_height *
(NBITS(panel_info.vl_bpix) >> 3));
+#ifdef CONFIG_CMD_BMP
draw_logo();
+#endif
}
lcd_panel_on(&panel_info);