Patch merged into coreboot/master: 2befcbb UEFI: Conditionally define the ASSERT macro

the following patch was just integrated into master:
commit 2befcbb85dc63da2c972c656656f390d976802e6
Author: Lee Leahy 
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 
    Reviewed-on: http://review.coreboot.org/10334
    Tested-by: build bot (Jenkins)
    Reviewed-by: Aaron Durbin

See http://review.coreboot.org/10334 for details.

-gerrit