x86: Rename zboot_run() to zboot_run_args()

Rename this function so we can (later) create a zboot_run() function
which looks the same as bootm_run()

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 2eece34..8d79141 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -435,8 +435,8 @@ int zboot_go(void)
        return ret;
 }
 
-int zboot_run(ulong addr, ulong size, ulong initrd, ulong initrd_size,
-             ulong base, char *cmdline)
+int zboot_run_args(ulong addr, ulong size, ulong initrd, ulong initrd_size,
+                  ulong base, char *cmdline)
 {
        int ret;
 

diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c
index c7b862e..ea4c9ed 100644 (file)
--- a/boot/bootmeth_cros.c
+++ b/boot/bootmeth_cros.c
@@ -446,9 +446,9 @@ static int cros_boot(struct udevice *dev, struct bootflow *bflow)
        }
 
        if (IS_ENABLED(CONFIG_X86)) {
-               ret = zboot_run(map_to_sysmem(bflow->buf), bflow->size, 0, 0,
-                               map_to_sysmem(bflow->x86_setup),
-                               bflow->cmdline);
+               ret = zboot_run_args(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 6116070..154fb98 100644 (file)
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -273,7 +273,7 @@ int bootm_process_cmdline(char *buf, int maxlen, int flags);
 int bootm_process_cmdline_env(int flags);
 
 /**
- * zboot_run() - Run through the various steps to boot a zimage
+ * zboot_run_args() - Run through the various steps to boot a zimage
  *
  * Boot a zimage, given the component parts
  *
@@ -289,8 +289,8 @@ int bootm_process_cmdline_env(int flags);
  *     to use for booting
  * Return: -EFAULT on error (normally it does not return)
  */
-int zboot_run(ulong addr, ulong size, ulong initrd, ulong initrd_size,
-             ulong base, char *cmdline);
+int zboot_run_args(ulong addr, ulong size, ulong initrd, ulong initrd_size,
+                  ulong base, char *cmdline);
 
 /*
  * zimage_get_kernel_version() - Get the version string from a kernel