summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2015-05-27 16:16:19 -0700
committerLeroy P Leahy <leroy.p.leahy@intel.com>2015-05-29 22:20:16 +0200
commit2befcbb85dc63da2c972c656656f390d976802e6 (patch)
treef6e36f82a17a36706f74af03ef7a3bca98bf3f08 /src
parentf4d65872d789307a25a80479fcfc1a66c53d42ae (diff)
downloadcoreboot-2befcbb85dc63da2c972c656656f390d976802e6.tar.xz
UEFI: Conditionally define the ASSERT macro
Only define the ASSERT macro when it is not already defined. This change allows the UEFI/FSP definitions to be included with most other coreboot includes. BRANCH=none BUG=None TEST=Build and run on sklrvp Change-Id: Iccfeb83eb1e52623ae0a0fe2a96b587ce61f82d7 Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: http://review.coreboot.org/10334 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h
index 594bd8e5dd..cf95ad85ed 100644
--- a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h
+++ b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h
@@ -66,12 +66,14 @@ static inline void debug_dead_loop(void)
}
#define _ASSERT(expression) debug_dead_loop()
+#ifndef ASSERT
#define ASSERT(expression) \
do { \
if (!(expression)) { \
_ASSERT(expression); \
} \
} while (FALSE)
+#endif
//
// Contents of the PEI_GRAPHICS_INFO_HOB