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>

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index b72e2f01bd578c32fb84c3f9ef7c5eece520a886..e8a1849947e624222a6327547380da036057afb9 100644 (file)
--- 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 cd72db8250cefee70c46e92d5a6d526bb1763c1e..f015f2e1c75faad5862ef875b54b0d869aa21feb 100644 (file)
--- 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 10a1bd65a754bd9fbc8e445450a8fc9bb82149b1..a9069d74404949e3cf2d6178a21cb492b4454d78 100644 (file)
--- 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