diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-15 11:58:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-15 11:58:08 -0400 |
| commit | 821aa1916ecc5116a6f80bcb8a73e70af5b99f4b (patch) | |
| tree | 26c50e2617957d5fa5ca8023eea0ba64d4ae21b2 | |
| parent | 9659eb46af6249b6e4b3712e60a1eb2e87fc48a1 (diff) | |
| parent | e616100eab84464f09baa93b3fe5c15087a385c1 (diff) | |
| download | u-boot-821aa1916ecc5116a6f80bcb8a73e70af5b99f4b.tar.gz | |
Merge tag 'efi-2019-04-rc4-3' of https://github.com/xypron2/u-boot
Pull request for UEFI system for v2019.04-rc4
Fix an error with the serial communication on boards with a very small
UART buffer which leads to a stalled system.
Provide an X86 reset driver for the UEFI runtime.
Fix a problem with parallel builds.
| -rw-r--r-- | lib/efi_selftest/efi_freestanding.c | 11 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/efi_selftest/efi_freestanding.c b/lib/efi_selftest/efi_freestanding.c new file mode 100644 index 0000000000..4b6c27e99f --- /dev/null +++ b/lib/efi_selftest/efi_freestanding.c @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Library for freestanding binary + * + * Copyright 2019, Heinrich Schuchardt <xypron.glpk@gmx.de> + * + * GCC requires that freestanding programs provide memcpy(), memmove(), + * memset(), and memcmp(). + */ + +#include "../efi_loader/efi_freestanding.c" diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ec5c41ec56..70de9bb13a 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -390,7 +390,7 @@ $(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcoun $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) -$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/../efi_loader/efi_freestanding.o +$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o $(call cmd,efi_ld) # ACPI |