Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 08:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Convert spl_usb_load_image() to use linker list

Browse source 
Add a linker list declaration for this method and remove the explicit
switch() code.

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:06 -06:00 committed by Tom Rini
parent dd6bf9025c
commit 56df46351a
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/spl/spl.c
View file

@ -400,9 +400,6 @@ static int spl_load_image(u32 boot_device)
bootdev.boot_device_name = "usb_ether"; bootdev.boot_device_name = "usb_ether";
return spl_net_load_image(&bootdev); return spl_net_load_image(&bootdev);
#endif #endif
#ifdef CONFIG_SPL_USB_SUPPORT
case BOOT_DEVICE_USB:
return spl_usb_load_image(&bootdev);
#endif #endif
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA_SUPPORT
case BOOT_DEVICE_SATA: case BOOT_DEVICE_SATA:

3
common/spl/spl_usb.c
View file

@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR;
static int usb_stor_curr_dev = -1; /* current device */ static int usb_stor_curr_dev = -1; /* current device */
#endif #endif
int spl_usb_load_image(struct spl_boot_device *bootdev) static int spl_usb_load_image(struct spl_boot_device *bootdev)
{ {
int err; int err;
struct blk_desc *stor_dev; struct blk_desc *stor_dev;
@ -61,3 +61,4 @@ int spl_usb_load_image(struct spl_boot_device *bootdev)
return 0; return 0;
} }
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USB, spl_usb_load_image);

3
include/spl.h
View file

@ -187,9 +187,6 @@ int spl_spi_load_image(struct spl_boot_device *bootdev);
/* Ethernet SPL functions */ /* Ethernet SPL functions */
int spl_net_load_image(struct spl_boot_device *bootdev); int spl_net_load_image(struct spl_boot_device *bootdev);
/* USB SPL functions */
int spl_usb_load_image(struct spl_boot_device *bootdev);
/* SATA SPL functions */ /* SATA SPL functions */
int spl_sata_load_image(struct spl_boot_device *bootdev); int spl_sata_load_image(struct spl_boot_device *bootdev);