V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sandbox: Support the bmp command 

Adjust this command to use map_sysmem() correctly so that it works on
sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-01-05 09:30:58 -07:00
parent 74b1320ae5
commit 72b335e91d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/cmd_bmp.c
View File

@ -15,6 +15,7 @@
#include <command.h> #include <command.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <malloc.h> #include <malloc.h>
#include <mapmem.h>
#include <splash.h> #include <splash.h>
#include <video.h> #include <video.h>
@ -57,7 +58,8 @@ struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
/* align to 32-bit-aligned-address + 2 */ /* align to 32-bit-aligned-address + 2 */
bmp = (struct bmp_image *)((((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) { if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, map_sysmem(addr, 0),
&len) != 0) {
free(dst); free(dst);
return NULL; return NULL;
} }
@ -187,7 +189,7 @@ U_BOOT_CMD(
*/ */
static int bmp_info(ulong addr) static int bmp_info(ulong addr)
{ {
struct bmp_image *bmp = (struct bmp_image *)addr; struct bmp_image *bmp = (struct bmp_image *)map_sysmem(addr, 0);
void *bmp_alloc_addr = NULL; void *bmp_alloc_addr = NULL;
unsigned long len; unsigned long len;
@ -224,7 +226,7 @@ static int bmp_info(ulong addr)
int bmp_display(ulong addr, int x, int y) int bmp_display(ulong addr, int x, int y)
{ {
int ret; int ret;
struct bmp_image *bmp = (struct bmp_image *)addr; struct bmp_image *bmp = map_sysmem(addr, 0);
void *bmp_alloc_addr = NULL; void *bmp_alloc_addr = NULL;
unsigned long len; unsigned long len;
@ -236,11 +238,12 @@ int bmp_display(ulong addr, int x, int y)
printf("There is no valid bmp file at the given address\n"); printf("There is no valid bmp file at the given address\n");
return 1; return 1;
} }
addr = map_to_sysmem(bmp);
#if defined(CONFIG_LCD) #if defined(CONFIG_LCD)
ret = lcd_display_bitmap((ulong)bmp, x, y); ret = lcd_display_bitmap(addr, x, y);
#elif defined(CONFIG_VIDEO) #elif defined(CONFIG_VIDEO)
ret = video_display_bitmap((unsigned long)bmp, x, y); ret = video_display_bitmap(addr, x, y);
#else #else
# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO # error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
#endif #endif