GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

compulab: splash: refactor splash.c

Browse source 
Move storage device specific code into its own function instead of
calling it directly from an otherwise storage device independent
function (cl_splash_screen_prepare).

This is a preparation for supporting multiple splash locations.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Nikita Kiryanov 2015-01-14 10:42:50 +02:00 • committed by Stefano Babic
parent 6947e3f56f
commit 7be4cd2cc5
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/compulab/common/common.h
View file

@ -25,9 +25,9 @@ static inline void cl_usb_hub_deinit(int gpio) {}
#endif /* CONFIG_CMD_USB */ #endif /* CONFIG_CMD_USB */
#ifdef CONFIG_SPLASH_SCREEN #ifdef CONFIG_SPLASH_SCREEN
int cl_splash_screen_prepare(int nand_offset); int cl_splash_screen_prepare(int offset);
#else /* !CONFIG_SPLASH_SCREEN */ #else /* !CONFIG_SPLASH_SCREEN */
static inline int cl_splash_screen_prepare(int nand_offset) static inline int cl_splash_screen_prepare(int offset)
{ {
return -ENOSYS; return -ENOSYS;
} }

43
board/compulab/common/splash.c
View file

@ -10,11 +10,32 @@
#include <nand.h> #include <nand.h>
#include <errno.h> #include <errno.h>
#include <bmp_layout.h> #include <bmp_layout.h>
#include "common.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
static int splash_load_from_nand(u32 bmp_load_addr, int nand_offset) static int splash_nand_read(u32 bmp_load_addr, int offset, size_t read_size)
{
return nand_read_skip_bad(&nand_info[nand_curr_device], offset,
&read_size, NULL,
nand_info[nand_curr_device].size,
(u_char *)bmp_load_addr);
}
#else
static int splash_nand_read(u32 bmp_load_addr, int offset, size_t read_size)
{
debug("%s: nand support not available\n", __func__);
return -ENOSYS;
}
#endif
static int splash_storage_read(u32 bmp_load_addr, int offset, size_t read_size)
{
return splash_nand_read(bmp_load_addr, offset, read_size);
}
static int splash_load_raw(u32 bmp_load_addr, int offset)
{ {
struct bmp_header *bmp_hdr; struct bmp_header *bmp_hdr;
int res; int res;
@ -23,10 +44,7 @@ static int splash_load_from_nand(u32 bmp_load_addr, int nand_offset)
if (bmp_load_addr + bmp_header_size >= gd->start_addr_sp) if (bmp_load_addr + bmp_header_size >= gd->start_addr_sp)
goto splash_address_too_high; goto splash_address_too_high;
res = nand_read_skip_bad(&nand_info[nand_curr_device], res = splash_storage_read(bmp_load_addr, offset, bmp_header_size);
nand_offset, &bmp_header_size,
NULL, nand_info[nand_curr_device].size,
(u_char *)bmp_load_addr);
if (res < 0) if (res < 0)
return res; return res;
@ -36,10 +54,7 @@ static int splash_load_from_nand(u32 bmp_load_addr, int nand_offset)
if (bmp_load_addr + bmp_size >= gd->start_addr_sp) if (bmp_load_addr + bmp_size >= gd->start_addr_sp)
goto splash_address_too_high; goto splash_address_too_high;
return nand_read_skip_bad(&nand_info[nand_curr_device], return splash_storage_read(bmp_load_addr, offset, bmp_size);
nand_offset, &bmp_size,
NULL, nand_info[nand_curr_device].size,
(u_char *)bmp_load_addr);
splash_address_too_high: splash_address_too_high:
printf("Error: splashimage address too high. Data overwrites U-Boot " printf("Error: splashimage address too high. Data overwrites U-Boot "
@ -47,14 +62,8 @@ splash_address_too_high:
return -EFAULT; return -EFAULT;
} }
#else
static inline int splash_load_from_nand(u32 bmp_load_addr, int nand_offset)
{
return -ENOSYS;
}
#endif /* CONFIG_CMD_NAND */
int cl_splash_screen_prepare(int nand_offset) int cl_splash_screen_prepare(int offset)
{ {
char *env_splashimage_value; char *env_splashimage_value;
u32 bmp_load_addr; u32 bmp_load_addr;
@ -69,5 +78,5 @@ int cl_splash_screen_prepare(int nand_offset)
return -EFAULT; return -EFAULT;
} }
return splash_load_from_nand(bmp_load_addr, nand_offset); return splash_load_raw(bmp_load_addr, offset);
} }