projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spl: Update ext functions to take an spl_image parameter
[oweals/u-boot.git]
/
drivers
/
mtd
/
spi
/
sunxi_spi_spl.c
diff --git
a/drivers/mtd/spi/sunxi_spi_spl.c
b/drivers/mtd/spi/sunxi_spi_spl.c
index a992bfaca1bebaaca23babdf4d12a18234f55cfd..67c7edd92d0c6b1d7b20d072ab50085ce9bcc5b8 100644
(file)
--- a/
drivers/mtd/spi/sunxi_spi_spl.c
+++ b/
drivers/mtd/spi/sunxi_spi_spl.c
@@
-262,7
+262,8
@@
static void spi0_read_data(void *buf, u32 addr, u32 len)
/*****************************************************************************/
/*****************************************************************************/
-int spl_spi_load_image(void)
+static int spl_spi_load_image(struct spl_image_info *spl_image,
+ struct spl_boot_device *bootdev)
{
int err;
struct image_header *header;
{
int err;
struct image_header *header;
@@
-271,13
+272,15
@@
int spl_spi_load_image(void)
spi0_init();
spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40);
spi0_init();
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)
return err;
if (err)
return err;
- spi0_read_data((void *)spl_image
.
load_addr, CONFIG_SYS_SPI_U_BOOT_OFFS,
- spl_image
.
size);
+ spi0_read_data((void *)spl_image
->
load_addr, CONFIG_SYS_SPI_U_BOOT_OFFS,
+ spl_image
->
size);
spi0_deinit();
return 0;
}
spi0_deinit();
return 0;
}
+/* Use priorty 0 to override the default if it happens to be linked in */
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_SPI, spl_spi_load_image);