karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / common / cmd_bmp.c

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 946031deaab4655ed9643f5e61e68cec24a6f083..cb1f07119b4f6c7963590c394a779f4339a2934e 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Detlev Zundel, DENX Software Engineering, dzu@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- * along 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+
  */
 
 /*
@@ -31,6 +15,7 @@
 #include <command.h>
 #include <asm/byteorder.h>
 #include <malloc.h>
+#include <splash.h>
 #include <video.h>
 
 static int bmp_info (ulong addr);
@@ -49,12 +34,12 @@ static int bmp_info (ulong addr);
  * didn't contain a valid BMP signature.
  */
 #ifdef CONFIG_VIDEO_BMP_GZIP
-bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp,
-                       void **alloc_addr)
+struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
+                            void **alloc_addr)
 {
        void *dst;
        unsigned long len;
-       bmp_image_t *bmp;
+       struct bmp_image *bmp;
 
        /*
         * Decompress bmp image
@@ -70,7 +55,7 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp,
        bmp = dst;
 
        /* align to 32-bit-aligned-address + 2 */
-       bmp = (bmp_image_t *)((((unsigned int)dst + 1) & ~3) + 2);
+       bmp = (struct bmp_image *)((((unsigned int)dst + 1) & ~3) + 2);
 
        if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
                free(dst);
@@ -95,8 +80,8 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp,
        return bmp;
 }
 #else
-bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp,
-                       void **alloc_addr)
+struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
+                            void **alloc_addr)
 {
        return NULL;
 }
@@ -125,6 +110,8 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
        ulong addr;
        int x = 0, y = 0;
 
+       splash_get_pos(&x, &y);
+
        switch (argc) {
        case 1:         /* use load_addr as default address */
                addr = load_addr;
@@ -134,9 +121,9 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
                break;
        case 4:
                addr = simple_strtoul(argv[1], NULL, 16);
-               x = simple_strtoul(argv[2], NULL, 10);
-               y = simple_strtoul(argv[3], NULL, 10);
-               break;
+               x = simple_strtoul(argv[2], NULL, 10);
+               y = simple_strtoul(argv[3], NULL, 10);
+               break;
        default:
                return CMD_RET_USAGE;
        }
@@ -200,7 +187,7 @@ U_BOOT_CMD(
  */
 static int bmp_info(ulong addr)
 {
-       bmp_image_t *bmp=(bmp_image_t *)addr;
+       struct bmp_image *bmp = (struct bmp_image *)addr;
        void *bmp_alloc_addr = NULL;
        unsigned long len;
 
@@ -237,7 +224,7 @@ static int bmp_info(ulong addr)
 int bmp_display(ulong addr, int x, int y)
 {
        int ret;
-       bmp_image_t *bmp = (bmp_image_t *)addr;
+       struct bmp_image *bmp = (struct bmp_image *)addr;
        void *bmp_alloc_addr = NULL;
        unsigned long len;