From d3a555eddb019ae4a0db7ab9c0c2297f0215a12f Mon Sep 17 00:00:00 2001 From: Nikita Kiryanov Date: Thu, 9 Aug 2012 00:14:50 +0000 Subject: common lcd: simplify lcd_logo Simplify lcd_logo by extracting bmp unzip into its own function. Signed-off-by: Nikita Kiryanov Signed-off-by: Igor Grinberg --- common/lcd.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'common/lcd.c') diff --git a/common/lcd.c b/common/lcd.c index 506a138cdd..8890635cf0 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -842,17 +842,7 @@ static void *lcd_logo(void) } #endif /* CONFIG_SPLASH_SCREEN_ALIGN */ -#ifdef CONFIG_VIDEO_BMP_GZIP - bmp_image_t *bmp = (bmp_image_t *)addr; - unsigned long len; - - if (!((bmp->header.signature[0] == 'B') && - (bmp->header.signature[1] == 'M'))) { - addr = (ulong)gunzip_bmp(addr, &len); - } -#endif - - if (lcd_display_bitmap(addr, x, y) == 0) + if (bmp_display(addr, x, y) == 0) return (void *)lcd_base; } #endif /* CONFIG_SPLASH_SCREEN */ -- cgit v1.2.1