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

bootm: Rename do_bootm_states() to bootm_run_states()

Browse source 
Rename the function to bootm_run_states() to better indicate ts
purpose. The 'do_' prefix is used to indicate a command processor,
which this is now not.

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:19 -07:00 • committed by Tom Rini
parent a6c49161cb
commit b5d397f489
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/mips/lib/bootm.c
View file

@ -217,7 +217,7 @@ static int boot_reloc_fdt(struct bootm_headers *images)
{
/*
* In case of legacy uImage's, relocation of FDT is already done
* by do_bootm_states() and should not repeated in 'bootm prep'.
* by bootm_run_states() and should not repeated in 'bootm prep'.
*/
if (images->state & BOOTM_STATE_FDT) {
debug("## FDT already relocated\n");

4
boot/bootm.c
View file

@ -990,7 +990,7 @@ unmap_image:
return ret;
}
int do_bootm_states(struct bootm_info *bmi, int states)
int bootm_run_states(struct bootm_info *bmi, int states)
{
struct bootm_headers *images = bmi->images;
boot_os_fn *boot_fn;
@ -1152,7 +1152,7 @@ int bootm_boot_start(ulong addr, const char *cmdline)
bootm_init(&bmi);
bmi.addr_img = addr_str;
bmi.cmd_name = "bootm";
ret = do_bootm_states(&bmi, states);
ret = bootm_run_states(&bmi, states);
return ret;
}

4
cmd/booti.c
View file

@ -34,7 +34,7 @@ static int booti_start(struct bootm_info *bmi)
unsigned long decomp_len;
int ctype;
ret = do_bootm_states(bmi, BOOTM_STATE_START);
ret = bootm_run_states(bmi, BOOTM_STATE_START);
/* Setup Linux kernel Image entry point */
if (!bmi->addr_img) {
@ -141,7 +141,7 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
states |= BOOTM_STATE_RAMDISK;
ret = do_bootm_states(&bmi, states);
ret = bootm_run_states(&bmi, states);
return ret;
}

4
cmd/bootm.c
View file

@ -118,7 +118,7 @@ static int do_bootm_subcommand(struct cmd_tbl *cmdtp, int flag, int argc,
bmi.argc = argc;
bmi.argv = argv;
ret = do_bootm_states(&bmi, state);
ret = bootm_run_states(&bmi, state);
#if defined(CONFIG_CMD_BOOTM_PRE_LOAD)
if (!ret && (state & BOOTM_STATE_PRE_LOAD))
@ -180,7 +180,7 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
bmi.argc = argc;
bmi.argv = argv;
ret = do_bootm_states(&bmi, states);
ret = bootm_run_states(&bmi, states);
return ret ? CMD_RET_FAILURE : 0;
}

4
cmd/bootz.c
View file

@ -40,7 +40,7 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc,
bmi.conf_fdt = argv[2];
/* do not set up argc and argv[] since nothing uses them */
ret = do_bootm_states(&bmi, BOOTM_STATE_START);
ret = bootm_run_states(&bmi, BOOTM_STATE_START);
/* Setup Linux kernel zImage entry point */
if (!argc) {
@ -104,7 +104,7 @@ int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
states |= BOOTM_STATE_RAMDISK;
ret = do_bootm_states(&bmi, states);
ret = bootm_run_states(&bmi, states);
return ret;
}

4
include/bootm.h
View file

@ -132,7 +132,7 @@ int bootm_find_images(ulong img_addr, const char *conf_ramdisk,
int bootm_measure(struct bootm_headers *images);
/**
* do_bootm_states() - Execute selected states of the bootm command.
* bootm_run_states() - Execute selected states of the bootm command.
*
* Note that if states contains more than one flag it MUST contain
* BOOTM_STATE_START, since this handles the addr_fit, conf_ramdisk and conf_fit
@ -149,7 +149,7 @@ int bootm_measure(struct bootm_headers *images);
* then the intent is to boot an OS, so this function will not return
* unless the image type is standalone.
*/
int do_bootm_states(struct bootm_info *bmi, int states);
int bootm_run_states(struct bootm_info *bmi, int states);
void arch_preboot_os(void);