diff options
| author | Tom Rini <[email protected]> | 2018-01-28 18:26:00 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-01-28 18:26:00 -0500 |
| commit | bd39d86420434eb8139a111c2582366bc90e65c6 (patch) | |
| tree | 072fe6ff300a984a8867c9d2506ed7906d435b2d /include | |
| parent | f2ee91501892d3280a4c58093ad3a18dccd0b562 (diff) | |
| parent | 29a8a2828e5c6f3f167a8526a80da992b4626daf (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-01-28
This is the second part of patches for 2018.03-rc1, fixing
a few minor issues and adding a readme file for iSCSI booting.
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/efi.h b/include/efi.h index 2f0be9c86cb..98bddbac1ad 100644 --- a/include/efi.h +++ b/include/efi.h @@ -19,7 +19,7 @@ #include <linux/string.h> #include <linux/types.h> -#ifdef CONFIG_EFI_STUB_64BIT +#if CONFIG_EFI_STUB_64BIT || (!defined(CONFIG_EFI_STUB) && defined(__x86_64__)) /* EFI uses the Microsoft ABI which is not the default for GCC */ #define EFIAPI __attribute__((ms_abi)) #else |