diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2012-08-09 00:14:50 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2012-09-05 10:27:44 +0200 |
| commit | d3a555eddb019ae4a0db7ab9c0c2297f0215a12f (patch) | |
| tree | 4d702c4c567b398c81f245d9df7ed184e116a0fd /common/lcd.c | |
| parent | a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721 (diff) | |
| download | olio-uboot-2014.01-d3a555eddb019ae4a0db7ab9c0c2297f0215a12f.tar.xz olio-uboot-2014.01-d3a555eddb019ae4a0db7ab9c0c2297f0215a12f.zip | |
common lcd: simplify lcd_logo
Simplify lcd_logo by extracting bmp unzip into its own function.
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/common/lcd.c b/common/lcd.c index 506a138cd..8890635cf 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 */ |