qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: Update ext functions to take an spl_image parameter 

Update the ext loader to avoid using the spl_image global variable.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-09-24 18:20:14 -06:00 committed by Tom Rini
parent 2a2ee2ac35
commit b4a6c2aae6
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/spl/spl_ext.c
View File

@ -10,8 +10,8 @@
#include <image.h> #include <image.h>
#ifdef CONFIG_SPL_EXT_SUPPORT #ifdef CONFIG_SPL_EXT_SUPPORT
int spl_load_image_ext(struct blk_desc *block_dev, int spl_load_image_ext(struct spl_image_info *spl_image,
int partition, struct blk_desc *block_dev, int partition,
const char *filename) const char *filename)
{ {
s32 err; s32 err;
@ -48,13 +48,13 @@ int spl_load_image_ext(struct blk_desc *block_dev,
goto end; goto end;
} }
err = spl_parse_image_header(&spl_image, header); err = spl_parse_image_header(spl_image, header);
if (err < 0) { if (err < 0) {
puts("spl: ext: failed to parse image header\n"); puts("spl: ext: failed to parse image header\n");
goto end; goto end;
} }
err = ext4fs_read((char *)spl_image.load_addr, filelen, &actlen); err = ext4fs_read((char *)spl_image->load_addr, filelen, &actlen);
end: end:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@ -67,7 +67,8 @@ end:
} }
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
int spl_load_image_ext_os(struct blk_desc *block_dev, int partition) int spl_load_image_ext_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition)
{ {
int err; int err;
__maybe_unused loff_t filelen, actlen; __maybe_unused loff_t filelen, actlen;
@ -104,7 +105,8 @@ int spl_load_image_ext_os(struct blk_desc *block_dev, int partition)
} }
file = getenv("falcon_image_file"); file = getenv("falcon_image_file");
if (file) { if (file) {
err = spl_load_image_ext(block_dev, partition, file); err = spl_load_image_ext(spl_image, block_dev,
partition, file);
if (err != 0) { if (err != 0) {
puts("spl: falling back to default\n"); puts("spl: falling back to default\n");
goto defaults; goto defaults;
@ -134,11 +136,12 @@ defaults:
return -1; return -1;
} }
return spl_load_image_ext(block_dev, partition, return spl_load_image_ext(spl_image, block_dev, partition,
CONFIG_SPL_FS_LOAD_KERNEL_NAME); CONFIG_SPL_FS_LOAD_KERNEL_NAME);
} }
#else #else
int spl_load_image_ext_os(struct blk_desc *block_dev, int partition) int spl_load_image_ext_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition)
{ {
return -ENOSYS; return -ENOSYS;
} }

4
common/spl/spl_mmc.c
View File

@ -245,13 +245,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc)
#endif #endif
#ifdef CONFIG_SPL_EXT_SUPPORT #ifdef CONFIG_SPL_EXT_SUPPORT
if (!spl_start_uboot()) { if (!spl_start_uboot()) {
err = spl_load_image_ext_os(&mmc->block_dev, err = spl_load_image_ext_os(spl_image, &mmc->block_dev,
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION); CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
if (!err) if (!err)
return err; return err;
} }
#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
err = spl_load_image_ext(&mmc->block_dev, err = spl_load_image_ext(spl_image, &mmc->block_dev,
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION, CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
if (!err) if (!err)

9
drivers/mtd/spi/sunxi_spi_spl.c
View File

@ -262,7 +262,8 @@ static void spi0_read_data(void *buf, u32 addr, u32 len)
/*****************************************************************************/ /*****************************************************************************/
static int spl_spi_load_image(struct spl_boot_device *bootdev) static int spl_spi_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{ {
int err; int err;
struct image_header *header; struct image_header *header;
@ -271,12 +272,12 @@ static int spl_spi_load_image(struct spl_boot_device *bootdev)
spi0_init(); spi0_init();
spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40); spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40);
err = spl_parse_image_header(&spl_image, header); err = spl_parse_image_header(spl_image, header);
if (err) if (err)
return err; return err;
spi0_read_data((void *)spl_image.load_addr, CONFIG_SYS_SPI_U_BOOT_OFFS, spi0_read_data((void *)spl_image->load_addr, CONFIG_SYS_SPI_U_BOOT_OFFS,
spl_image.size); spl_image->size);
spi0_deinit(); spi0_deinit();
return 0; return 0;

6
include/spl.h
View File

@ -191,9 +191,11 @@ int spl_load_image_fat_os(struct blk_desc *block_dev, int partition);
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image); void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image);
/* SPL EXT image functions */ /* SPL EXT image functions */
int spl_load_image_ext(struct blk_desc *block_dev, int partition, int spl_load_image_ext(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition,
const char *filename); const char *filename);
int spl_load_image_ext_os(struct blk_desc *block_dev, int partition); int spl_load_image_ext_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition);
/** /**
* spl_init() - Set up device tree and driver model in SPL if enabled * spl_init() - Set up device tree and driver model in SPL if enabled