From 2befcbb85dc63da2c972c656656f390d976802e6 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Wed, 27 May 2015 16:16:19 -0700 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/10334 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h | 2 ++ 1 file changed, 2 insertions(+) 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