Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / lib / tizen / tizen.c

diff --git a/lib/tizen/tizen.c b/lib/tizen/tizen.c
index e872591cd183e46f9480643dc3d706fc690e8a11..814ed18329e01e5c7000344c795dab52c719ccea 100644 (file)
--- a/lib/tizen/tizen.c
+++ b/lib/tizen/tizen.c
@@ -9,18 +9,25 @@
 #include <lcd.h>
 #include <libtizen.h>
 
-#include "tizen_hd_logo.h"
-#include "tizen_hd_logo_data.h"
+#include "tizen_logo_16bpp.h"
+#include "tizen_logo_16bpp_gzip.h"
 
 void get_tizen_logo_info(vidinfo_t *vid)
 {
-       switch (vid->resolution) {
-       case HD_RESOLUTION:
-               vid->logo_width = TIZEN_HD_LOGO_WIDTH;
-               vid->logo_height = TIZEN_HD_LOGO_HEIGHT;
-               vid->logo_addr = (ulong)tizen_hd_logo;
+       switch (vid->vl_bpix) {
+       case 4:
+               vid->logo_width = TIZEN_LOGO_16BPP_WIDTH;
+               vid->logo_height = TIZEN_LOGO_16BPP_HEIGHT;
+               vid->logo_x_offset = TIZEN_LOGO_16BPP_X_OFFSET;
+               vid->logo_y_offset = TIZEN_LOGO_16BPP_Y_OFFSET;
+#if defined(CONFIG_VIDEO_BMP_GZIP)
+               vid->logo_addr = (ulong)tizen_logo_16bpp_gzip;
+#else
+               vid->logo_addr = (ulong)tizen_logo_16bpp;
+#endif
                break;
        default:
+               vid->logo_addr = 0;
                break;
        }
 }