diff options
author | Tom Rini <trini@konsulko.com> | 2024-04-10 13:49:35 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-04-10 13:49:35 -0600 |
commit | ab3453e7b12daef47b9e91da2a2a3d48615dc6fc (patch) | |
tree | b36ffe46f4e98d1145b75daa0f84dbc473701eb9 /include/bootm.h | |
parent | 843143303cb64133427ab1b3166185e936233d50 (diff) | |
parent | 8d24535e84856f9a881a9cd11d07842a42bc68a3 (diff) | |
download | u-boot-ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.zip u-boot-ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.tar.gz u-boot-ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.tar.bz2 |
Merge patch series "Complete decoupling of zboot logic from commands"
Simon Glass <sjg@chromium.org> says:
This series refactors the zboot code to allow it to be used with
CONFIG_COMMAND disabled.
A new zboot_run() function is used to boot a zimage.
Diffstat (limited to 'include/bootm.h')
-rw-r--r-- | include/bootm.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/bootm.h b/include/bootm.h index 9e0f8d6..6116070 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -273,21 +273,24 @@ 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 * * @addr: Address where the bzImage is moved before booting, either * BZIMAGE_LOAD_ADDR or ZIMAGE_LOAD_ADDR - * @base: Pointer to the boot parameters, typically at address - * DEFAULT_SETUP_BASE + * @size: Size of bzImage, or 0 to detect this * @initrd: Address of the initial ramdisk, or 0 if none * @initrd_size: Size of the initial ramdisk, or 0 if none - * @cmdline: Command line to use for booting + * @base_addr: If non-zero, this indicates that the boot parameters have already + * been loaded by the caller to this address, so the load_zimage() call + * in zboot_load() will be skipped when booting + * @cmdline: If non-NULL, the environment variable containing the 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 |