From: Tom Rini <trini@konsulko.com>
Date: Thu, 14 Nov 2019 14:48:26 +0000 (-0500)
Subject: Merge tag 'efi-2020-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
X-Git-Tag: v2020.01-rc3~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=14b254b5f5a841e1227e3667cf94fbcdadaf720e;p=oweals%2Fu-boot.git

Merge tag 'efi-2020-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Pull request for UEFI sub-system for efi-2020-01-rc3

The following changes for the UEFI subsystem are provided:

* allow building UEFI binaries on the sandbox
* enable access to file systems without partition tables
* correctly check the return value of efi_dp_from_file()
---

14b254b5f5a841e1227e3667cf94fbcdadaf720e
diff --cc arch/sandbox/lib/crt0_sandbox_efi.S
index 0000000000,b15766c514..88537345dd
mode 000000,100644..100644
--- a/arch/sandbox/lib/crt0_sandbox_efi.S
+++ b/arch/sandbox/lib/crt0_sandbox_efi.S
@@@ -1,0 -1,32 +1,32 @@@
 -// SPDX-License-Identifier: GPL-2.0+
++/* SPDX-License-Identifier: GPL-2.0+ */
+ /*
+  * PE/COFF header for EFI applications
+  *
+  * Copyright (c) 2019 Heinrich Schuchardt
+  */
+ 
+ #include <host_arch.h>
+ 
+ #if HOST_ARCH == HOST_ARCH_X86_64
+ #include "../../../arch/x86/lib/crt0_x86_64_efi.S"
+ #endif
+ 
+ #if HOST_ARCH == HOST_ARCH_X86
+ #include "../../../arch/x86/lib/crt0_ia32_efi.S"
+ #endif
+ 
+ #if HOST_ARCH == HOST_ARCH_AARCH64
+ #include "../../../arch/arm/lib/crt0_aarch64_efi.S"
+ #endif
+ 
+ #if HOST_ARCH == HOST_ARCH_ARM
+ #include "../../../arch/arm/lib/crt0_arm_efi.S"
+ #endif
+ 
+ #if HOST_ARCH == HOST_ARCH_RISCV32
+ #include "../../../arch/riscv/lib/crt0_riscv_efi.S"
+ #endif
+ 
+ #if HOST_ARCH == HOST_ARCH_RISCV64
+ #include "../../../arch/riscv/lib/crt0_riscv_efi.S"
+ #endif