michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spl: remove redundant prints in boot_from_devices

Browse Source 
The null check for loader in boot_from_devices was moved earlier in the
code path by the commit ae409a84e7 ("spl: NULL check variable before
dereference"), therefore the subsequent null checks for loader are not
necessary.

This patch removes those checks and refactors the prints to be more
useful in case of errors.

Signed-off-by: Anshul Dalal <anshuld@ti.com>
This commit is contained in:
Anshul Dalal
2025-10-31 13:16:26 +05:30
committed by Tom Rini
parent 9e2bce78fd
commit fdf36c2e9a
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
common/spl/spl.c
View File

@@ -643,26 +643,26 @@ static int boot_from_devices(struct spl_image_info *spl_image,
if (loader && bootdev != loader->boot_device)
continue;
if (!CONFIG_IS_ENABLED(SILENT_CONSOLE)) {
if (loader)
printf("Trying to boot from %s\n",
spl_loader_name(loader));
else if (CONFIG_IS_ENABLED(SHOW_ERRORS)) {
printf(PHASE_PROMPT
"Unsupported Boot Device %d\n",
bootdev);
} else {
puts(PHASE_PROMPT
"Unsupported Boot Device!\n");
}
printf("Trying to boot from %s\n",
spl_loader_name(loader));
}
if (loader) {
ret = spl_load_image(spl_image, loader);
if (!ret) {
spl_image->boot_device = bootdev;
return 0;
}
printf("Error: %d\n", ret);
ret = spl_load_image(spl_image, loader);
if (!ret) {
spl_image->boot_device = bootdev;
return 0;
}
printf("Error: %d\n", ret);
}
if (!CONFIG_IS_ENABLED(SILENT_CONSOLE)) {
if (CONFIG_IS_ENABLED(SHOW_ERRORS))
printf(PHASE_PROMPT
"Unsupported Boot Device %d\n",
bootdev);
else
printf(PHASE_PROMPT
"Unsupported Boot Device!\n");
}
}