diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-18 08:29:35 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-18 08:29:35 -0600 |
| commit | cdd20e3f66fe910da0545d3615decf511519b4a6 (patch) | |
| tree | 9162980e2293b2a2405060f44529fe7a25cd0e1e /include | |
| parent | 3434b88d2c2fdad3cc947f9e9b03dabfdd3feb5c (diff) | |
Revert "Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled""
As reported by Jonas Karlman this series breaks booting on some AArch64
platforms with common use cases. For now the best path forward is to
revert the series.
This reverts commit 777c28460947371ada40868dc994dfe8537d7115, reversing
changes made to ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.
Link: https://lore.kernel.org/u-boot/50dfa3d6-a1ca-4492-a3fc-8d8c56b40b43@kwiboo.se/
Signed-off-by: Tom Rini <trini@konsulko.com>
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 6983375ff8b..61160705215 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, NULL for default + * @cmdline: Command line to set */ int bootm_boot_start(ulong addr, const char *cmdline); diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h index e59c187c05c..610d4f91414 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 ulong fastboot_buf_addr; +extern void *fastboot_buf_addr; /** * fastboot_buf_size - size of the fastboot download buffer diff --git a/include/fastboot.h b/include/fastboot.h index c75184cc912..1e7920eb913 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: Address of download buffer, or 0 for default + * @buf_addr: Pointer to download buffer, or NULL for default * @buf_size: Size of download buffer, or zero for default */ -void fastboot_init(ulong buf_addr, u32 buf_size); +void fastboot_init(void *buf_addr, u32 buf_size); /** * fastboot_boot() - Execute fastboot boot command |