Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / video / exynos_fb.c

diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c
index dfe329fbc631e21630509dfea41ed6fab5c453ab..c3606d5b026ad702b2290d713abffd0b390b1c22 100644 (file)
--- a/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@ -38,16 +38,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int lcd_line_length;
-int lcd_color_fg;
-int lcd_color_bg;
-
-void *lcd_base;
-void *lcd_console_address;
-
-short console_col;
-short console_row;
-
 static unsigned int panel_width, panel_height;
 
 /*
@@ -71,11 +61,9 @@ static void exynos_lcd_init_mem(void *lcdbase, vidinfo_t *vid)
 
        fb_size = vid->vl_row * vid->vl_col * (NBITS(vid->vl_bpix) >> 3);
 
-       lcd_base = lcdbase;
-
        palette_size = NBITS(vid->vl_bpix) == 8 ? 256 : 16;
 
-       exynos_fimd_lcd_init_mem((unsigned long)lcd_base,
+       exynos_fimd_lcd_init_mem((unsigned long)lcdbase,
                        (unsigned long)fb_size, palette_size);
 }
 
@@ -331,10 +319,10 @@ void lcd_ctrl_init(void *lcdbase)
 #ifdef CONFIG_OF_CONTROL
        if (exynos_fimd_parse_dt(gd->fdt_blob))
                debug("Can't get proper panel info\n");
-#endif
+#else
        /* initialize parameters which is specific to panel. */
        init_panel_info(&panel_info);
-
+#endif
        panel_width = panel_info.vl_width;
        panel_height = panel_info.vl_height;
 
@@ -346,7 +334,7 @@ void lcd_ctrl_init(void *lcdbase)
 void lcd_enable(void)
 {
        if (panel_info.logo_on) {
-               memset(lcd_base, 0, panel_width * panel_height *
+               memset((void *) gd->fb_base, 0, panel_width * panel_height *
                                (NBITS(panel_info.vl_bpix) >> 3));
 #ifdef CONFIG_CMD_BMP
                draw_logo();