]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
video: exynos_fb: Make a call to draw_logo only when CONFIG_CMD_BMP is selected
authorAjay Kumar <ajaykumar.rs@samsung.com>
Sun, 13 Jan 2013 23:32:16 +0000 (23:32 +0000)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 14 Jan 2013 10:17:28 +0000 (19:17 +0900)
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>
drivers/video/exynos_fb.c

index 183bca07c5899ca42190ece283a56e47bdc2ceac..ee0ed06d6fe60d711a420b8710e996cb487fa9e8 100644 (file)
@@ -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);