mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 12:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootm: Reduce arguments to bootm_find_os()

Browse Source 
This function only uses one argument so pass it in directly.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2023-11-18 14:05:05 -07:00 committed by Tom Rini
parent b13e94886c
commit 3e3bd5bda7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
boot/bootm.c
View File

@ -304,8 +304,14 @@ static int bootm_pre_load(const char *addr_str)
return ret;
}
static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
/**
* bootm_find_os(): Find the OS to boot
*
* @cmd_name: Command name that started this boot, e.g. "bootm"
* @addr_fit: Address and/or FIT specifier (first arg of bootm command)
* Return: 0 on success, -ve on error
*/
static int bootm_find_os(const char *cmd_name, const char *addr_fit)
{
const void *os_hdr;
#ifdef CONFIG_ANDROID_BOOT_IMAGE
@ -316,12 +322,11 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc,
int ret;
/* get kernel image header, start address and length */
ret = boot_get_kernel(argv[0], &images, &images.os.image_start,
ret = boot_get_kernel(addr_fit, &images, &images.os.image_start,
&images.os.image_len, &os_hdr);
if (ret) {
if (ret == -EPROTOTYPE)
printf("Wrong Image Type for %s command\n",
cmdtp->name);
printf("Wrong Image Type for %s command\n", cmd_name);
printf("ERROR %dE: can't get kernel image!\n", ret);
return 1;
@ -987,7 +992,7 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc,
ret = bootm_pre_load(argv[0]);
if (!ret && (states & BOOTM_STATE_FINDOS))
ret = bootm_find_os(cmdtp, flag, argc, argv);
ret = bootm_find_os(cmdtp->name, argv[0]);
if (!ret && (states & BOOTM_STATE_FINDOTHER))
ret = bootm_find_other(cmdtp, flag, argc, argv);