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 390f71c19ea88104829ef92f52a4ff27e0c86c58..814ed18329e01e5c7000344c795dab52c719ccea 100644 (file)
--- a/lib/tizen/tizen.c
+++ b/lib/tizen/tizen.c
@@ -2,39 +2,32 @@
  * (C) Copyright 2012 Samsung Electronics
  * Donghwa Lee <dh09.lee@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * aint with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #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;
        }
 }