Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 14:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootm: Create a function to run through the bootm states

Browse source 
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>
This commit is contained in:
Simon Glass 2023-12-15 20:14:21 -07:00 • committed by Tom Rini
parent 725ddf1f24
commit e1a24c025c
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
boot/bootm.c
View file

@ -1123,6 +1123,23 @@ err:
return ret; return ret;
} }
int bootm_run(struct bootm_info *bmi)
{
int states;
bmi->cmd_name = "bootm";
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 | BOOTM_STATE_MEASURE;
if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
states |= BOOTM_STATE_RAMDISK;
if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_MIPS))
states |= BOOTM_STATE_OS_CMDLINE;
return bootm_run_states(bmi, states);
}
int bootm_boot_start(ulong addr, const char *cmdline) int bootm_boot_start(ulong addr, const char *cmdline)
{ {
char addr_str[30]; char addr_str[30];

14
cmd/bootm.c
View file

@ -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[]) int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{ {
struct bootm_info bmi; struct bootm_info bmi;
int states;
int ret; int ret;
/* determine if we have a sub command */ /* 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); 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); bootm_init(&bmi);
if (argc) if (argc)
bmi.addr_img = argv[0]; 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.argc = argc;
bmi.argv = argv; bmi.argv = argv;
ret = bootm_run_states(&bmi, states); ret = bootm_run(&bmi);
return ret ? CMD_RET_FAILURE : 0; return ret ? CMD_RET_FAILURE : 0;
} }

13
include/bootm.h
View file

@ -150,6 +150,19 @@ int bootm_measure(struct bootm_headers *images);
*/ */
int bootm_run_states(struct bootm_info *bmi, int states); int bootm_run_states(struct bootm_info *bmi, int states);
/**
* bootm_run() - Run the entire bootm process
*
* This runs through the bootm process from start to finish, using the default
* set of states.
*
* This uses bootm_run_states().
*
* @bmi: bootm information
* Return: 0 if ok, something else on error
*/
int bootm_run(struct bootm_info *bmi);
void arch_preboot_os(void); void arch_preboot_os(void);
/* /*