diff options
| author | Simon Glass <sjg@chromium.org> | 2016-11-07 15:47:16 (GMT) |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2016-11-14 22:24:04 (GMT) |
| commit | 58ad86288fd32f1f969ac654f2074c090f0abe32 (patch) | |
| tree | 6e1e10ca88e11026cb2dc443c909d3998eabd8c3 | |
| parent | 5bd828b5329ed9b7c85beae1e532daa710f22168 (diff) | |
| download | u-boot-58ad86288fd32f1f969ac654f2074c090f0abe32.tar.xz | |
x86: Enable EFI loader support
Enable this so that EFI applications (notably grub) can be run under U-Boot
on x86 platforms.
At present the 'hello world' EFI application is not supported for the
qemu-x86_efi_payload64 board. That board builds a payload consisting of a
64-bit header and a 32-bit U-Boot, which is incompatible with the way the
EFI loader builds its EFI application. The following error is obtained:
x86_64-linux-ld.bfd: i386 architecture of input file
`lib/efi_loader/helloworld.o' is incompatible with i386:x86-64 output
This could be corrected with additional Makefile rules. For now, this
feature is disabled for that board.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
[agraf: drop hello kconfig bits]
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | configs/efi-x86_defconfig | 1 | ||||
| -rw-r--r-- | doc/README.x86 | 1 | ||||
| -rw-r--r-- | lib/efi_loader/Kconfig | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index b31c73b..1fe6142 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -34,3 +34,4 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_EFI=y +# CONFIG_EFI_LOADER is not set diff --git a/doc/README.x86 b/doc/README.x86 index 6799559..a38cc1b 100644 --- a/doc/README.x86 +++ b/doc/README.x86 @@ -1077,7 +1077,6 @@ TODO List --------- - Audio - Chrome OS verified boot -- Support for CONFIG_EFI_LOADER - Building U-Boot to run in 64-bit mode References diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 7d4106e..d2b6327 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -1,6 +1,6 @@ config EFI_LOADER bool "Support running EFI Applications in U-Boot" - depends on ARM && OF_LIBFDT + depends on (ARM || X86) && OF_LIBFDT default y help Select this option if you want to run EFI applications (like grub2) |