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>

diff --git a/common/lcd.c b/common/lcd.c
index 506a138cdd47792e31b064ba85295473ca0f717b..8890635cf0f41a9cfe0de65c6d661042750759ee 100644 (file)
--- 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 */