diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-31 07:28:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-31 07:28:36 -0500 |
| commit | 5fec3c853d5e6b998db66f586871839c408195a3 (patch) | |
| tree | c3368f8625b3a9383f30745ce1fafafc35cafac3 /arch/x86/lib/bootm.c | |
| parent | 87a9aa604de8a4a50642e25b88af328ab375893b (diff) | |
| parent | 86bb48880d75653d692cd02edb81888a2ed2dbb2 (diff) | |
Merge tag 'efi-next' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request of efi-next
Documentation:
* Add Sunxi board description
UEFI:
* Improvements to U-Boot running on top of UEFI
Diffstat (limited to 'arch/x86/lib/bootm.c')
| -rw-r--r-- | arch/x86/lib/bootm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 667e5e689e3..57cba5c65d3 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -179,10 +179,14 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit) * U-Boot is setting them up that way for itself in * arch/i386/cpu/cpu.c. * - * Note that we cannot currently boot a kernel while running as - * an EFI application. Please use the payload option for that. + * Note: this is incomplete for EFI kernels! + * + * This can boot a kernel while running as an EFI application, + * but if the kernel requires EFI support then that support needs + * to be enabled first (see EFI_LOADER). Also the EFI information + * must enabled with setup_efi_info(). See setup_zimage() for + * how this is done with the stub. */ -#ifndef CONFIG_EFI_APP __asm__ __volatile__ ( "movl $0, %%ebp\n" "cli\n" @@ -191,7 +195,6 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit) [boot_params] "S"(setup_base), "b"(0), "D"(0) ); -#endif } /* We can't get to here */ |