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 /arch/x86/lib | |
| 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 '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 8fc35e1..94aa335 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_CMD_BOOTM) += bootm.o +obj-$(CONFIG_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 c15f11f..4e4cf18 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: Note many features are missing\n"); + printf("Jumping to 64-bit U-Boot\n"); ret = cpu_jump_to_64bit_uboot(spl_image->entry_point); debug("ret=%d\n", ret); hang(); |