diff options
| author | Simon Glass | 2023-12-15 20:14:21 -0700 |
|---|---|---|
| committer | Tom Rini | 2023-12-21 16:07:52 -0500 |
| commit | e1a24c025c3b065b417bd0dd491cb7000583b334 (patch) | |
| tree | 19ce5052dff83bd388354b9848ec104cccbda5c2 /cmd | |
| parent | 725ddf1f24f7d08aa344f64d06c62cf5f50a6b6c (diff) | |
bootm: Create a function to run through the bootm states
In quite a few places, the bootm command is used to handle a boot. We
want these to be done without needing CONFIG_CMDLINE, so add a new
bootm_run() function to handle this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootm.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/cmd/bootm.c b/cmd/bootm.c index 26d20b9118d..9737a2d28c0 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -136,7 +136,6 @@ static int do_bootm_subcommand(struct cmd_tbl *cmdtp, int flag, int argc, int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct bootm_info bmi; - int states; int ret; /* determine if we have a sub command */ @@ -157,17 +156,6 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return do_bootm_subcommand(cmdtp, flag, argc, argv); } - states = BOOTM_STATE_START | BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | - BOOTM_STATE_FINDOTHER | BOOTM_STATE_LOADOS | - BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | - BOOTM_STATE_OS_GO; - if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH)) - states |= BOOTM_STATE_RAMDISK; - if (IS_ENABLED(CONFIG_MEASURED_BOOT)) - states |= BOOTM_STATE_MEASURE; - if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_MIPS)) - states |= BOOTM_STATE_OS_CMDLINE; - bootm_init(&bmi); if (argc) bmi.addr_img = argv[0]; @@ -180,7 +168,7 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bmi.argc = argc; bmi.argv = argv; - ret = bootm_run_states(&bmi, states); + ret = bootm_run(&bmi); return ret ? CMD_RET_FAILURE : 0; } |