diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-10 17:06:27 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-10 17:06:27 -0600 |
| commit | 777c28460947371ada40868dc994dfe8537d7115 (patch) | |
| tree | ed76982806de141ac6bcbc303b3167f90e8877e7 /include | |
| parent | ab3453e7b12daef47b9e91da2a2a3d48615dc6fc (diff) | |
| parent | cf70f75447133c497f9e5c56f2b33c8f2d3f08b5 (diff) | |
| download | u-boot-777c28460947371ada40868dc994dfe8537d7115.zip u-boot-777c28460947371ada40868dc994dfe8537d7115.tar.gz u-boot-777c28460947371ada40868dc994dfe8537d7115.tar.bz2 | |
Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled"
Simon Glass <sjg@chromium.org> says:
This series is the culmanation of the current line of refactoring
series. It adjusts pxe to call the booting functionality directly
rather than going through the command-line interface.
With this is is possible to boot using the extlinux bootmeth without
the command line enabled.
It also updates fastboot to do a similar thing.
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootm.h | 2 | ||||
| -rw-r--r-- | include/fastboot-internal.h | 2 | ||||
| -rw-r--r-- | include/fastboot.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/bootm.h b/include/bootm.h index 6116070..6983375 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -317,7 +317,7 @@ void zimage_dump(struct boot_params *base_ptr, bool show_cmdline); * bootm_boot_start() - Boot an image at the given address * * @addr: Image address - * @cmdline: Command line to set + * @cmdline: Command line to set, NULL for default */ int bootm_boot_start(ulong addr, const char *cmdline); diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h index 610d4f9..e59c187 100644 --- a/include/fastboot-internal.h +++ b/include/fastboot-internal.h @@ -6,7 +6,7 @@ /** * fastboot_buf_addr - base address of the fastboot download buffer */ -extern void *fastboot_buf_addr; +extern ulong fastboot_buf_addr; /** * fastboot_buf_size - size of the fastboot download buffer diff --git a/include/fastboot.h b/include/fastboot.h index 1e7920e..c75184c 100644 --- a/include/fastboot.h +++ b/include/fastboot.h @@ -114,13 +114,13 @@ int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason); */ void fastboot_set_progress_callback(void (*progress)(const char *msg)); -/* +/** * fastboot_init() - initialise new fastboot protocol session * - * @buf_addr: Pointer to download buffer, or NULL for default + * @buf_addr: Address of download buffer, or 0 for default * @buf_size: Size of download buffer, or zero for default */ -void fastboot_init(void *buf_addr, u32 buf_size); +void fastboot_init(ulong buf_addr, u32 buf_size); /** * fastboot_boot() - Execute fastboot boot command |