diff options
| author | Simon Glass <sjg@chromium.org> | 2023-12-03 17:29:35 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-10 13:49:16 -0600 |
| commit | d2c485a0321689bc6becac73b4f49b3e39cb288e (patch) | |
| tree | afcc35b1eb492c06344bf55d78a2bb9f9ceede92 | |
| parent | 02ed6c333ec480e2b36485bfcf804e9b12984266 (diff) | |
x86: zboot: Rename zboot_start() to zboot_run()
The term 'start' is used withint bootm and zboot to indicate the first
phase of booting an image.
Since zboot_start() does the whole boot, rename it to zboot_run() to
align with bootm_run() etc.
Fix a log message while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/lib/zimage.c | 6 | ||||
| -rw-r--r-- | boot/bootmeth_cros.c | 6 | ||||
| -rw-r--r-- | include/bootm.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index b72e2f01bd5..e8a1849947e 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -437,8 +437,8 @@ int zboot_go(void) return ret; } -int zboot_start(ulong addr, ulong size, ulong initrd, ulong initrd_size, - ulong base, char *cmdline) +int zboot_run(ulong addr, ulong size, ulong initrd, ulong initrd_size, + ulong base, char *cmdline) { int ret; @@ -463,7 +463,7 @@ int zboot_start(ulong addr, ulong size, ulong initrd, ulong initrd_size, return log_msg_ret("set", ret); ret = zboot_go(); if (ret) - return log_msg_ret("set", ret); + return log_msg_ret("go", ret); return -EFAULT; } diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index cd72db8250c..f015f2e1c75 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -432,9 +432,9 @@ static int cros_boot(struct udevice *dev, struct bootflow *bflow) } if (IS_ENABLED(CONFIG_X86)) { - ret = zboot_start(map_to_sysmem(bflow->buf), bflow->size, 0, 0, - map_to_sysmem(bflow->x86_setup), - bflow->cmdline); + ret = zboot_run(map_to_sysmem(bflow->buf), bflow->size, 0, 0, + map_to_sysmem(bflow->x86_setup), + bflow->cmdline); } else { ret = bootm_boot_start(map_to_sysmem(bflow->buf), bflow->cmdline); diff --git a/include/bootm.h b/include/bootm.h index 10a1bd65a75..a9069d74404 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -137,7 +137,7 @@ int bootm_process_cmdline(char *buf, int maxlen, int flags); int bootm_process_cmdline_env(int flags); /** - * zboot_start() - Boot a zimage + * zboot_run() - Run through the various steps to boot a zimage * * Boot a zimage, given the component parts * @@ -150,8 +150,8 @@ int bootm_process_cmdline_env(int flags); * @cmdline: Command line to use for booting * Return: -EFAULT on error (normally it does not return) */ -int zboot_start(ulong addr, ulong size, ulong initrd, ulong initrd_size, - ulong base, char *cmdline); +int zboot_run(ulong addr, ulong size, ulong initrd, ulong initrd_size, + ulong base, char *cmdline); /* * zimage_get_kernel_version() - Get the version string from a kernel |