mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 07:31:15 +00:00
cmd: bmp: Split bmp commands and functions
To enable splash screen at SPL, need to compile cmd/bmp.c which also includes bmp commands, since SPL doesn't use commands split bmp.c into common/bmp.c which includes all bmp functions and cmd/bmp.c which only contains bmp commands. Add function delclaration for bmp_info in video.h. Signed-off-by: Nikhil M Jain <n-jain1@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Nikhil M Jain
Anatolij Gustschin
parent
072b0e16c4
commit
58182b2db9
3 changed files with 163 additions and 160 deletions
162
cmd/bmp.c
162
cmd/bmp.c
|
|
@ -9,84 +9,12 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <bmp_layout.h>
|
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <dm.h>
|
|
||||||
#include <gzip.h>
|
|
||||||
#include <image.h>
|
#include <image.h>
|
||||||
#include <log.h>
|
|
||||||
#include <malloc.h>
|
|
||||||
#include <mapmem.h>
|
#include <mapmem.h>
|
||||||
#include <splash.h>
|
#include <splash.h>
|
||||||
#include <video.h>
|
#include <video.h>
|
||||||
#include <asm/byteorder.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
static int bmp_info (ulong addr);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Allocate and decompress a BMP image using gunzip().
|
|
||||||
*
|
|
||||||
* Returns a pointer to the decompressed image data. This pointer is
|
|
||||||
* aligned to 32-bit-aligned-address + 2.
|
|
||||||
* See doc/README.displaying-bmps for explanation.
|
|
||||||
*
|
|
||||||
* The allocation address is passed to 'alloc_addr' and must be freed
|
|
||||||
* by the caller after use.
|
|
||||||
*
|
|
||||||
* Returns NULL if decompression failed, or if the decompressed data
|
|
||||||
* didn't contain a valid BMP signature.
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_VIDEO_BMP_GZIP
|
|
||||||
struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
|
|
||||||
void **alloc_addr)
|
|
||||||
{
|
|
||||||
void *dst;
|
|
||||||
unsigned long len;
|
|
||||||
struct bmp_image *bmp;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Decompress bmp image
|
|
||||||
*/
|
|
||||||
len = CONFIG_VIDEO_LOGO_MAX_SIZE;
|
|
||||||
/* allocate extra 3 bytes for 32-bit-aligned-address + 2 alignment */
|
|
||||||
dst = malloc(CONFIG_VIDEO_LOGO_MAX_SIZE + 3);
|
|
||||||
if (!dst) {
|
|
||||||
puts("Error: malloc in gunzip failed!\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* align to 32-bit-aligned-address + 2 */
|
|
||||||
bmp = dst + 2;
|
|
||||||
|
|
||||||
if (gunzip(bmp, CONFIG_VIDEO_LOGO_MAX_SIZE, map_sysmem(addr, 0),
|
|
||||||
&len)) {
|
|
||||||
free(dst);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (len == CONFIG_VIDEO_LOGO_MAX_SIZE)
|
|
||||||
puts("Image could be truncated (increase CONFIG_VIDEO_LOGO_MAX_SIZE)!\n");
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Check for bmp mark 'BM'
|
|
||||||
*/
|
|
||||||
if (!((bmp->header.signature[0] == 'B') &&
|
|
||||||
(bmp->header.signature[1] == 'M'))) {
|
|
||||||
free(dst);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
debug("Gzipped BMP image detected!\n");
|
|
||||||
|
|
||||||
*alloc_addr = dst;
|
|
||||||
return bmp;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
|
|
||||||
void **alloc_addr)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int do_bmp_info(struct cmd_tbl *cmdtp, int flag, int argc,
|
static int do_bmp_info(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||||
char *const argv[])
|
char *const argv[])
|
||||||
|
|
@ -137,7 +65,7 @@ static int do_bmp_display(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||||
return CMD_RET_USAGE;
|
return CMD_RET_USAGE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (bmp_display(addr, x, y));
|
return (bmp_display(addr, x, y));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct cmd_tbl cmd_bmp_sub[] = {
|
static struct cmd_tbl cmd_bmp_sub[] = {
|
||||||
|
|
@ -145,22 +73,6 @@ static struct cmd_tbl cmd_bmp_sub[] = {
|
||||||
U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
|
U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_NEEDS_MANUAL_RELOC
|
|
||||||
void bmp_reloc(void) {
|
|
||||||
fixup_cmdtable(cmd_bmp_sub, ARRAY_SIZE(cmd_bmp_sub));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Subroutine: do_bmp
|
|
||||||
*
|
|
||||||
* Description: Handler for 'bmp' command..
|
|
||||||
*
|
|
||||||
* Inputs: argv[1] contains the subcommand
|
|
||||||
*
|
|
||||||
* Return: None
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static int do_bmp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
static int do_bmp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
||||||
{
|
{
|
||||||
struct cmd_tbl *c;
|
struct cmd_tbl *c;
|
||||||
|
|
@ -183,73 +95,3 @@ U_BOOT_CMD(
|
||||||
"info <imageAddr> - display image info\n"
|
"info <imageAddr> - display image info\n"
|
||||||
"bmp display <imageAddr> [x y] - display image at x,y"
|
"bmp display <imageAddr> [x y] - display image at x,y"
|
||||||
);
|
);
|
||||||
|
|
||||||
/*
|
|
||||||
* Subroutine: bmp_info
|
|
||||||
*
|
|
||||||
* Description: Show information about bmp file in memory
|
|
||||||
*
|
|
||||||
* Inputs: addr address of the bmp file
|
|
||||||
*
|
|
||||||
* Return: None
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static int bmp_info(ulong addr)
|
|
||||||
{
|
|
||||||
struct bmp_image *bmp = (struct bmp_image *)map_sysmem(addr, 0);
|
|
||||||
void *bmp_alloc_addr = NULL;
|
|
||||||
unsigned long len;
|
|
||||||
|
|
||||||
if (!((bmp->header.signature[0]=='B') &&
|
|
||||||
(bmp->header.signature[1]=='M')))
|
|
||||||
bmp = gunzip_bmp(addr, &len, &bmp_alloc_addr);
|
|
||||||
|
|
||||||
if (bmp == NULL) {
|
|
||||||
printf("There is no valid bmp file at the given address\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("Image size : %d x %d\n", le32_to_cpu(bmp->header.width),
|
|
||||||
le32_to_cpu(bmp->header.height));
|
|
||||||
printf("Bits per pixel: %d\n", le16_to_cpu(bmp->header.bit_count));
|
|
||||||
printf("Compression : %d\n", le32_to_cpu(bmp->header.compression));
|
|
||||||
|
|
||||||
if (bmp_alloc_addr)
|
|
||||||
free(bmp_alloc_addr);
|
|
||||||
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int bmp_display(ulong addr, int x, int y)
|
|
||||||
{
|
|
||||||
struct udevice *dev;
|
|
||||||
int ret;
|
|
||||||
struct bmp_image *bmp = map_sysmem(addr, 0);
|
|
||||||
void *bmp_alloc_addr = NULL;
|
|
||||||
unsigned long len;
|
|
||||||
|
|
||||||
if (!((bmp->header.signature[0]=='B') &&
|
|
||||||
(bmp->header.signature[1]=='M')))
|
|
||||||
bmp = gunzip_bmp(addr, &len, &bmp_alloc_addr);
|
|
||||||
|
|
||||||
if (!bmp) {
|
|
||||||
printf("There is no valid bmp file at the given address\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
addr = map_to_sysmem(bmp);
|
|
||||||
|
|
||||||
ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
|
|
||||||
if (!ret) {
|
|
||||||
bool align = false;
|
|
||||||
|
|
||||||
if (x == BMP_ALIGN_CENTER || y == BMP_ALIGN_CENTER)
|
|
||||||
align = true;
|
|
||||||
|
|
||||||
ret = video_bmp_display(dev, addr, x, y, align);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bmp_alloc_addr)
|
|
||||||
free(bmp_alloc_addr);
|
|
||||||
|
|
||||||
return ret ? CMD_RET_FAILURE : 0;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
153
common/bmp.c
Normal file
153
common/bmp.c
Normal file
|
|
@ -0,0 +1,153 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0+
|
||||||
|
/*
|
||||||
|
* (C) Copyright 2002
|
||||||
|
* Detlev Zundel, DENX Software Engineering, dzu@denx.de.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* BMP handling routines
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <bmp_layout.h>
|
||||||
|
#include <command.h>
|
||||||
|
#include <dm.h>
|
||||||
|
#include <gzip.h>
|
||||||
|
#include <log.h>
|
||||||
|
#include <malloc.h>
|
||||||
|
#include <mapmem.h>
|
||||||
|
#include <splash.h>
|
||||||
|
#include <video.h>
|
||||||
|
#include <asm/byteorder.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Allocate and decompress a BMP image using gunzip().
|
||||||
|
*
|
||||||
|
* Returns a pointer to the decompressed image data. This pointer is
|
||||||
|
* aligned to 32-bit-aligned-address + 2.
|
||||||
|
* See doc/README.displaying-bmps for explanation.
|
||||||
|
*
|
||||||
|
* The allocation address is passed to 'alloc_addr' and must be freed
|
||||||
|
* by the caller after use.
|
||||||
|
*
|
||||||
|
* Returns NULL if decompression failed, or if the decompressed data
|
||||||
|
* didn't contain a valid BMP signature.
|
||||||
|
*/
|
||||||
|
#ifdef CONFIG_VIDEO_BMP_GZIP
|
||||||
|
struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
|
||||||
|
void **alloc_addr)
|
||||||
|
{
|
||||||
|
void *dst;
|
||||||
|
unsigned long len;
|
||||||
|
struct bmp_image *bmp;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Decompress bmp image
|
||||||
|
*/
|
||||||
|
len = CONFIG_VIDEO_LOGO_MAX_SIZE;
|
||||||
|
/* allocate extra 3 bytes for 32-bit-aligned-address + 2 alignment */
|
||||||
|
dst = malloc(CONFIG_VIDEO_LOGO_MAX_SIZE + 3);
|
||||||
|
if (!dst) {
|
||||||
|
puts("Error: malloc in gunzip failed!\n");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* align to 32-bit-aligned-address + 2 */
|
||||||
|
bmp = dst + 2;
|
||||||
|
|
||||||
|
if (gunzip(bmp, CONFIG_VIDEO_LOGO_MAX_SIZE, map_sysmem(addr, 0),
|
||||||
|
&len)) {
|
||||||
|
free(dst);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
if (len == CONFIG_VIDEO_LOGO_MAX_SIZE)
|
||||||
|
puts("Image could be truncated (increase CONFIG_VIDEO_LOGO_MAX_SIZE)!\n");
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check for bmp mark 'BM'
|
||||||
|
*/
|
||||||
|
if (!((bmp->header.signature[0] == 'B') &&
|
||||||
|
(bmp->header.signature[1] == 'M'))) {
|
||||||
|
free(dst);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
debug("Gzipped BMP image detected!\n");
|
||||||
|
|
||||||
|
*alloc_addr = dst;
|
||||||
|
return bmp;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
|
||||||
|
void **alloc_addr)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_NEEDS_MANUAL_RELOC
|
||||||
|
void bmp_reloc(void)
|
||||||
|
{
|
||||||
|
fixup_cmdtable(cmd_bmp_sub, ARRAY_SIZE(cmd_bmp_sub));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int bmp_info(ulong addr)
|
||||||
|
{
|
||||||
|
struct bmp_image *bmp = (struct bmp_image *)map_sysmem(addr, 0);
|
||||||
|
void *bmp_alloc_addr = NULL;
|
||||||
|
unsigned long len;
|
||||||
|
|
||||||
|
if (!((bmp->header.signature[0] == 'B') &&
|
||||||
|
(bmp->header.signature[1] == 'M')))
|
||||||
|
bmp = gunzip_bmp(addr, &len, &bmp_alloc_addr);
|
||||||
|
|
||||||
|
if (!bmp) {
|
||||||
|
printf("There is no valid bmp file at the given address\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Image size : %d x %d\n", le32_to_cpu(bmp->header.width),
|
||||||
|
le32_to_cpu(bmp->header.height));
|
||||||
|
printf("Bits per pixel: %d\n", le16_to_cpu(bmp->header.bit_count));
|
||||||
|
printf("Compression : %d\n", le32_to_cpu(bmp->header.compression));
|
||||||
|
|
||||||
|
if (bmp_alloc_addr)
|
||||||
|
free(bmp_alloc_addr);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int bmp_display(ulong addr, int x, int y)
|
||||||
|
{
|
||||||
|
struct udevice *dev;
|
||||||
|
int ret;
|
||||||
|
struct bmp_image *bmp = map_sysmem(addr, 0);
|
||||||
|
void *bmp_alloc_addr = NULL;
|
||||||
|
unsigned long len;
|
||||||
|
|
||||||
|
if (!((bmp->header.signature[0] == 'B') &&
|
||||||
|
(bmp->header.signature[1] == 'M')))
|
||||||
|
bmp = gunzip_bmp(addr, &len, &bmp_alloc_addr);
|
||||||
|
|
||||||
|
if (!bmp) {
|
||||||
|
printf("There is no valid bmp file at the given address\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
addr = map_to_sysmem(bmp);
|
||||||
|
|
||||||
|
ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
|
||||||
|
if (!ret) {
|
||||||
|
bool align = false;
|
||||||
|
|
||||||
|
if (x == BMP_ALIGN_CENTER || y == BMP_ALIGN_CENTER)
|
||||||
|
align = true;
|
||||||
|
|
||||||
|
ret = video_bmp_display(dev, addr, x, y, align);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bmp_alloc_addr)
|
||||||
|
free(bmp_alloc_addr);
|
||||||
|
|
||||||
|
return ret ? CMD_RET_FAILURE : 0;
|
||||||
|
}
|
||||||
|
|
@ -357,4 +357,12 @@ void *video_get_u_boot_logo(void);
|
||||||
*/
|
*/
|
||||||
int bmp_display(ulong addr, int x, int y);
|
int bmp_display(ulong addr, int x, int y);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* bmp_info() - Show information about bmp file
|
||||||
|
*
|
||||||
|
* @addr: address of bmp file
|
||||||
|
* Returns: 0 if OK, else 1 if bmp image not found
|
||||||
|
*/
|
||||||
|
int bmp_info(ulong addr);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue