[coreboot-gerrit] New patch to review for coreboot: da052eb UEFI: Conditionally define the ASSERT macro

[Leroy P Leahy (leroy.p.leahy@intel.com)]

Leroy P Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10334

-gerrit

commit da052ebcc0b73ed5cb5580c13550c72cd6a1959c
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Wed May 27 16:16:19 2015 -0700

    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 at intel.com>
---
 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 594bd8e..cf95ad8 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