diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-13 13:30:54 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-13 13:30:54 +0100 |
| commit | d53ccdb341cf16e32c0ca2d6099b194d9572fe0c (patch) | |
| tree | 1ef7ca4c54463e02d0da5f6351ac5bebc5418c76 /drivers/video/exynos_fb.c | |
| parent | 7bc5c8c93032a7b86e268a172955e15b84f1aac3 (diff) | |
| parent | e25bfecf7ba54a5b56cf991af8a2f2bb22994293 (diff) | |
| download | u-boot-imx-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.zip u-boot-imx-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.tar.gz u-boot-imx-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/video/exynos_fb.c')
| -rw-r--r-- | drivers/video/exynos_fb.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index 7d4c6e0..00a0a11 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -62,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) { } @@ -323,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); |