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 /arch/x86/lib | |
| parent | 3434b88d2c2fdad3cc947f9e9b03dabfdd3feb5c (diff) | |
| download | u-boot-cdd20e3f66fe910da0545d3615decf511519b4a6.zip u-boot-cdd20e3f66fe910da0545d3615decf511519b4a6.tar.gz u-boot-cdd20e3f66fe910da0545d3615decf511519b4a6.tar.bz2 | |
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 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/lib/spl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 94aa335..8fc35e1 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_X86_32BIT_INIT) += string.o endif ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_BOOTM) += bootm.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o endif obj-y += cmd_boot.o obj-$(CONFIG_$(SPL_)COREBOOT_SYSINFO) += coreboot/ diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 4e4cf18..c15f11f 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -283,7 +283,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) { int ret; - printf("Jumping to 64-bit U-Boot\n"); + printf("Jumping to 64-bit U-Boot: Note many features are missing\n"); ret = cpu_jump_to_64bit_uboot(spl_image->entry_point); debug("ret=%d\n", ret); hang(); |