V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

spl: Move the loading code into its own function 

Create a boot_from_devices() function to handle trying each device. This
helps to reduce the size of the already-large board_init_r() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-11-30 15:30:51 -07:00 committed by Tom Rini
parent ebc4ef61d7
commit 540bfe7daa
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/spl/spl.c
View File

@ -374,12 +374,36 @@ static int spl_load_image(struct spl_image_info *spl_image, u32 boot_device)
bootdev.boot_device = boot_device; bootdev.boot_device = boot_device;
bootdev.boot_device_name = NULL; bootdev.boot_device_name = NULL;
if (loader)
return loader->load_image(spl_image, &bootdev);
return loader->load_image(spl_image, &bootdev);
}
/**
* boot_from_devices() - Try loading an booting U-Boot from a list of devices
*
* @spl_image: Place to put the image details if successful
* @spl_boot_list: List of boot devices to try
* @count: Number of elements in spl_boot_list
* @return 0 if OK, -ve on error
*/
static int boot_from_devices(struct spl_image_info *spl_image,
u32 spl_boot_list[], int count)
{
int i;
for (i = 0; i < count && spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
struct spl_image_loader *loader;
announce_boot_device(spl_boot_list[i]);
loader = spl_ll_find_loader(spl_boot_list[i]);
#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
puts("SPL: Unsupported Boot Device!\n"); if (!loader)
puts("SPL: Unsupported Boot Device!\n");
#endif #endif
if (loader && !spl_load_image(spl_image, spl_boot_list[i]))
return 0;
}
return -ENODEV; return -ENODEV;
} }
@ -393,7 +417,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
BOOT_DEVICE_NONE, BOOT_DEVICE_NONE,
}; };
struct spl_image_info spl_image; struct spl_image_info spl_image;
int i;
debug(">>spl:board_init_r()\n"); debug(">>spl:board_init_r()\n");
@ -420,15 +443,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
memset(&spl_image, '\0', sizeof(spl_image)); memset(&spl_image, '\0', sizeof(spl_image));
board_boot_order(spl_boot_list); board_boot_order(spl_boot_list);
for (i = 0; i < ARRAY_SIZE(spl_boot_list) &&
spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
announce_boot_device(spl_boot_list[i]);
if (!spl_load_image(&spl_image, spl_boot_list[i]))
break;
}
if (i == ARRAY_SIZE(spl_boot_list) || if (boot_from_devices(&spl_image, spl_boot_list,
spl_boot_list[i] == BOOT_DEVICE_NONE) { ARRAY_SIZE(spl_boot_list))) {
puts("SPL: failed to boot from all boot devices\n"); puts("SPL: failed to boot from all boot devices\n");
hang(); hang();
} }