From 491728f1d3432286c91b9d564f694aa85d7cd3d1 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Mon, 22 Jan 2018 16:30:56 +0530 Subject: [PATCH] drivers/intel/fsp2_0: Make use of Resource Type macro from EDK code Users are getting build error due to duplicate macro definitions of same resource type between fsp driver code and UEFI headers. Hence this patch ensures to refer a single source location for macro definitions to avoid compilation error. Change-Id: If022eb29550a9310b095bff6130b02fb0a25ef7a Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/23356 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh --- src/drivers/intel/fsp2_0/include/fsp/util.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 6d53fda41f..ecbd7faf92 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -38,6 +38,7 @@ struct hob_resource { uint64_t length; } __packed; +#if CONFIG_UDK_VERSION < CONFIG_UDK_2017_VERSION enum resource_type { EFI_RESOURCE_SYSTEM_MEMORY = 0, EFI_RESOURCE_MEMORY_MAPPED_IO = 1, @@ -48,6 +49,7 @@ enum resource_type { EFI_RESOURCE_IO_RESERVED = 6, EFI_RESOURCE_MAX_MEMORY_TYPE = 7, }; +#endif enum hob_type { HOB_TYPE_HANDOFF = 0x0001,