summaryrefslogtreecommitdiff
path: root/include/efi.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-01-28 18:26:00 -0500
committerTom Rini <trini@konsulko.com>2018-01-28 18:26:00 -0500
commitbd39d86420434eb8139a111c2582366bc90e65c6 (patch)
tree072fe6ff300a984a8867c9d2506ed7906d435b2d /include/efi.h
parentf2ee91501892d3280a4c58093ad3a18dccd0b562 (diff)
parent29a8a2828e5c6f3f167a8526a80da992b4626daf (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/efi.h')
-rw-r--r--include/efi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/efi.h b/include/efi.h
index 2f0be9c86c..98bddbac1a 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