Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Convert spl_spi_load_image() to use linker list

Browse source 
Add a linker list declaration for this method and remove the explicit
switch() code. Also set up the sunxi function.

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:09 -06:00 committed by Tom Rini
parent 0a9b73a13e
commit 139db7af4e
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/spl/spl.c
View file

@ -384,10 +384,6 @@ static int spl_load_image(u32 boot_device)
return loader->load_image(&bootdev);
switch (boot_device) {
#if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
case BOOT_DEVICE_SPI:
return spl_spi_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_ETH_SUPPORT
case BOOT_DEVICE_CPGMAC:
#ifdef CONFIG_SPL_ETH_DEVICE

4
common/spl/spl_spi.c
View file

@ -65,7 +65,7 @@ static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
* configured and available since this code loads the main U-Boot image
* from SPI into SDRAM and starts it from there.
*/
int spl_spi_load_image(struct spl_boot_device *bootdev)
static int spl_spi_load_image(struct spl_boot_device *bootdev)
{
int err = 0;
struct spi_flash *flash;
@ -121,3 +121,5 @@ int spl_spi_load_image(struct spl_boot_device *bootdev)
return err;
}
/* Use priorty 1 so that boards can override this */
SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_SPI, spl_spi_load_image);

4
drivers/mtd/spi/sunxi_spi_spl.c
View file

@ -262,7 +262,7 @@ static void spi0_read_data(void *buf, u32 addr, u32 len)
/*****************************************************************************/
int spl_spi_load_image(struct spl_boot_device *bootdev)
static int spl_spi_load_image(struct spl_boot_device *bootdev)
{
int err;
struct image_header *header;
@ -281,3 +281,5 @@ int spl_spi_load_image(struct spl_boot_device *bootdev)
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);

3
include/spl.h
View file

@ -181,9 +181,6 @@ struct spl_image_loader {
.load_image = __method, \
}
/* SPI SPL functions */
int spl_spi_load_image(struct spl_boot_device *bootdev);
/* Ethernet SPL functions */
int spl_net_load_image(struct spl_boot_device *bootdev);