colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spl: Report a loader failure

Browse Source 
If a loader returns an error code it is silently ignored. Show a message
to at least provide some feedback to the user.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-12-19 11:28:57 -07:00
committed by Tom Rini
parent 92a4fd0a29
commit 5f158d8832
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/spl/spl.c
View File

@@ -612,6 +612,7 @@ static int boot_from_devices(struct spl_image_info *spl_image,
for (i = 0; i < count && spl_boot_list[i] != BOOT_DEVICE_NONE; i++) { for (i = 0; i < count && spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
struct spl_image_loader *loader; struct spl_image_loader *loader;
int bootdev = spl_boot_list[i]; int bootdev = spl_boot_list[i];
int ret;
if (CONFIG_IS_ENABLED(SHOW_ERRORS)) if (CONFIG_IS_ENABLED(SHOW_ERRORS))
ret = -ENXIO; ret = -ENXIO;
@@ -631,10 +632,13 @@ static int boot_from_devices(struct spl_image_info *spl_image,
"Unsupported Boot Device!\n"); "Unsupported Boot Device!\n");
} }
} }
if (loader && if (loader) {
!spl_load_image(spl_image, loader)) { ret = spl_load_image(spl_image, loader);
spl_image->boot_device = bootdev; if (!ret) {
return 0; spl_image->boot_device = bootdev;
return 0;
}
printf("Error: %d\n", ret);
} }
} }
} }