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

[platform/kernel/u-boot.git] / drivers / video / exynos_fb.c

diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c
index c3606d5..00a0a11 100644 (file)
--- a/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@ -4,20 +4,7 @@
  * Author: InKi Dae <inki.dae@samsung.com>
  * Author: Donghwa Lee <dh09.lee@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -75,31 +62,6 @@ 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;
-       ulong addr;
-
-       if (panel_width >= panel_info.logo_width) {
-               x = ((panel_width - panel_info.logo_width) >> 1);
-       } else {
-               x = 0;
-               printf("Warning: image width is bigger than display width\n");
-       }
-
-       if (panel_height >= panel_info.logo_height) {
-               y = ((panel_height - panel_info.logo_height) >> 1) - 4;
-       } else {
-               y = 0;
-               printf("Warning: image height is bigger than display height\n");
-       }
-
-       addr = panel_info.logo_addr;
-       bmp_display(addr, x, y);
-}
-#endif
-
 void __exynos_cfg_lcd_gpio(void)
 {
 }
@@ -336,9 +298,6 @@ void lcd_enable(void)
        if (panel_info.logo_on) {
                memset((void *) gd->fb_base, 0, panel_width * panel_height *
                                (NBITS(panel_info.vl_bpix) >> 3));
-#ifdef CONFIG_CMD_BMP
-               draw_logo();
-#endif
        }
 
        lcd_panel_on(&panel_info);