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

bootm: Tidy up boot_selected_os()

Browse Source 
Use struct bootm_info with this function, to avoiding needing to
create a new one.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass
2023-12-15 20:14:20 -07:00
committed by Tom Rini
parent b5d397f489
commit 725ddf1f24
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
boot/bootm_os.c
View File

@@ -566,20 +566,15 @@ __weak void board_preboot_os(void)
/* please define board specific board_preboot_os() */
}
int boot_selected_os(int argc, char *const argv[], int state,
struct bootm_headers *images, boot_os_fn *boot_fn)
int boot_selected_os(int state, struct bootm_info *bmi, boot_os_fn *boot_fn)
{
struct bootm_info bmi;
arch_preboot_os();
board_preboot_os();
bmi.argc = argc;
bmi.argv = argv;
bmi.images = images;
boot_fn(state, &bmi);
boot_fn(state, bmi);
/* Stand-alone may return when 'autostart' is 'no' */
if (images->os.type == IH_TYPE_STANDALONE ||
if (bmi->images->os.type == IH_TYPE_STANDALONE ||
IS_ENABLED(CONFIG_SANDBOX) ||
state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */
return 0;