diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-03 12:27:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-03 12:27:56 -0400 |
| commit | a0115ceb56ad71c3c34091d9d8ba5938708c900d (patch) | |
| tree | a5a434d90cab87552a360598995569b2defb573a /arch/x86/lib | |
| parent | 22781fca1d5aa9270a42271f9c20d97b85f72b73 (diff) | |
| parent | 80483b2ab62ca7cd200db445b6920ee96d17df88 (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-06-03
A number of fixes and feature completeness work this time around:
- Fix sunxi GOP reservation
- Fix cursor position
- Fix efi_get_variable
- Allow more selftest parts to build on x86_64
- Allow unaligned memory access on armv7
- Implement ReinstallProtocolInterface
- More sandbox preparation
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/Makefile | 12 | ||||
| -rw-r--r-- | arch/x86/lib/bootm.c | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 51d451f952..5a64f6eddc 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -68,8 +68,18 @@ extra-$(CONFIG_EFI_STUB_64BIT) += crt0_x86_64_efi.o reloc_x86_64_efi.o endif -ifneq ($(CONFIG_EFI_STUB)$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),) +ifdef CONFIG_EFI_STUB + ifeq ($(CONFIG_$(SPL_)X86_64),) extra-y += $(EFI_CRT0) $(EFI_RELOC) endif + +else + +ifndef CONFIG_SPL_BUILD +ifneq ($(CONFIG_CMD_BOOTEFI_SELFTEST)$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),) +extra-y += $(EFI_CRT0) $(EFI_RELOC) +endif +endif + endif diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 533ba075bb..54c22fe6de 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -27,10 +27,6 @@ DECLARE_GLOBAL_DATA_PTR; #define COMMAND_LINE_OFFSET 0x9000 -__weak void board_quiesce_devices(void) -{ -} - void bootm_announce_and_cleanup(void) { printf("\nStarting kernel ...\n\n"); |