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

spl: Pass the loader into spl_load_image() 

Rather than have this function figure out the correct loader again, pass
it in as a parameter.

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

8
common/spl/spl.c
View File

@ -367,12 +367,12 @@ static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
return NULL; return NULL;
} }
static int spl_load_image(struct spl_image_info *spl_image, u32 boot_device) static int spl_load_image(struct spl_image_info *spl_image,
struct spl_image_loader *loader)
{ {
struct spl_boot_device bootdev; struct spl_boot_device bootdev;
struct spl_image_loader *loader = spl_ll_find_loader(boot_device);
bootdev.boot_device = boot_device; bootdev.boot_device = loader->boot_device;
bootdev.boot_device_name = NULL; bootdev.boot_device_name = NULL;
return loader->load_image(spl_image, &bootdev); return loader->load_image(spl_image, &bootdev);
@ -400,7 +400,7 @@ static int boot_from_devices(struct spl_image_info *spl_image,
if (!loader) if (!loader)
puts("SPL: Unsupported Boot Device!\n"); puts("SPL: Unsupported Boot Device!\n");
#endif #endif
if (loader && !spl_load_image(spl_image, spl_boot_list[i])) if (loader && !spl_load_image(spl_image, loader))
return 0; return 0;
} }