colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: zboot: Rename zboot_start() to zboot_run()

Browse Source 
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>
This commit is contained in:
Simon Glass
2023-12-03 17:29:35 -07:00
committed by Tom Rini
parent 02ed6c333e
commit d2c485a032
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/lib/zimage.c
View File

@@ -437,7 +437,7 @@ int zboot_go(void)
return ret; return ret;
} }
int zboot_start(ulong addr, ulong size, ulong initrd, ulong initrd_size, int zboot_run(ulong addr, ulong size, ulong initrd, ulong initrd_size,
ulong base, char *cmdline) ulong base, char *cmdline)
{ {
int ret; int ret;
@@ -463,7 +463,7 @@ int zboot_start(ulong addr, ulong size, ulong initrd, ulong initrd_size,
return log_msg_ret("set", ret); return log_msg_ret("set", ret);
ret = zboot_go(); ret = zboot_go();
if (ret) if (ret)
return log_msg_ret("set", ret); return log_msg_ret("go", ret);
return -EFAULT; return -EFAULT;
} }

2
boot/bootmeth_cros.c
View File

@@ -432,7 +432,7 @@ static int cros_boot(struct udevice *dev, struct bootflow *bflow)
} }
if (IS_ENABLED(CONFIG_X86)) { if (IS_ENABLED(CONFIG_X86)) {
ret = zboot_start(map_to_sysmem(bflow->buf), bflow->size, 0, 0, ret = zboot_run(map_to_sysmem(bflow->buf), bflow->size, 0, 0,
map_to_sysmem(bflow->x86_setup), map_to_sysmem(bflow->x86_setup),
bflow->cmdline); bflow->cmdline);
} else { } else {

4
include/bootm.h
View File

@@ -137,7 +137,7 @@ int bootm_process_cmdline(char *buf, int maxlen, int flags);
int bootm_process_cmdline_env(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 * Boot a zimage, given the component parts
* *
@@ -150,7 +150,7 @@ int bootm_process_cmdline_env(int flags);
* @cmdline: Command line to use for booting * @cmdline: Command line to use for booting
* Return: -EFAULT on error (normally it does not return) * Return: -EFAULT on error (normally it does not return)
*/ */
int zboot_start(ulong addr, ulong size, ulong initrd, ulong initrd_size, int zboot_run(ulong addr, ulong size, ulong initrd, ulong initrd_size,
ulong base, char *cmdline); ulong base, char *cmdline);
/* /*