Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: Exit EFI boot services before starting kernel

Browse source 
When running the EFI app, we need to exit boot services before jumping
to Linux.

At some point it may be possible to jump to Linux and pass on the system
table, and:

  * install the device-tree as configuration table
  * use LoadImage() to load the kernel image (e.g. from memory)
  * start the image with StartImage()

This should allow the Linux efistub to be used. For now, this is not
implemented.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-03-20 08:30:09 +13:00 committed by Heinrich Schuchardt
parent 37c9f9cc86
commit 5a2a1d8093
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/x86/lib/bootm.c
View file

@ -10,6 +10,7 @@
#include <common.h> #include <common.h>
#include <bootstage.h> #include <bootstage.h>
#include <command.h> #include <command.h>
#include <efi.h>
#include <hang.h> #include <hang.h>
#include <log.h> #include <log.h>
#include <asm/global_data.h> #include <asm/global_data.h>
@ -156,6 +157,23 @@ int boot_linux_kernel(ulong setup_base, ulong entry, bool image_64bit)
#ifdef CONFIG_SYS_COREBOOT #ifdef CONFIG_SYS_COREBOOT
timestamp_add_now(TS_U_BOOT_START_KERNEL); timestamp_add_now(TS_U_BOOT_START_KERNEL);
#endif #endif
/*
* Exit EFI boot services just before jumping, after all console
* output, since the console won't be available afterwards.
*/
if (IS_ENABLED(CONFIG_EFI_APP)) {
int ret;
ret = efi_store_memory_map(efi_get_priv());
if (ret)
return ret;
printf("Exiting EFI boot services\n");
ret = efi_call_exit_boot_services();
if (ret)
return ret;
}
if (image_64bit) { if (image_64bit) {
if (!cpu_has_64bit()) { if (!cpu_has_64bit()) {
puts("Cannot boot 64-bit kernel on 32-bit machine\n"); puts("Cannot boot 64-bit kernel on 32-bit machine\n");