[PATCH 10/13] x86: zboot: Rename zboot_start() to zboot_run()
Simon Glass
sjg at chromium.org
Mon Dec 4 01:29:35 CET 2023
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 at chromium.org>
---
arch/x86/lib/zimage.c | 6 +++---
boot/bootmeth_cros.c | 6 +++---
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 b72e2f01bd57..e8a1849947e6 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 cd72db8250ce..f015f2e1c75f 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 ce5298e4ed97..c815c40e3c4d 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -242,7 +242,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
*
@@ -255,8 +255,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
--
2.43.0.rc2.451.g8631bc7472-goog
More information about the U-Boot
mailing list