From ee48361cf00ec8939b9019df666c2b755aacc7f4 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Sat, 28 Jul 2018 09:11:19 +0800 Subject: [PATCH 1/1] FmpDevicePkg: Remove DisplayUpdateProgressLib mapping for FmpDxe FmpDxe does not consume DisplayUpdateProgressLib, so remove the mapping in FmpDevicePkg.dsc. Also rename the ESRT GUIDs. Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Michael D Kinney --- FmpDevicePkg/FmpDevicePkg.dsc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 525640de2e..8d2436627d 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -43,8 +43,8 @@ # # Define ESRT GUIDs for Firmware Management Protocol instances # - DEFINE FMP_GRAPHICS_ESRT_GUID = B461B3BD-E62A-4A71-841C-50BA4E500267 - DEFINE FMP_TEXT_ESRT_GUID = 226034C4-8B67-4536-8653-D6EE7CE5A316 + DEFINE SYSTEM_FMP_ESRT_GUID = B461B3BD-E62A-4A71-841C-50BA4E500267 + DEFINE DEVICE_FMP_ESRT_GUID = 226034C4-8B67-4536-8653-D6EE7CE5A316 [LibraryClasses] UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf @@ -116,11 +116,9 @@ FmpDevicePkg/FmpDxe/FmpDxe.inf { # - # FILE_GUID is FMP ESRT GUID + # FILE_GUID is used as ESRT GUID # - FILE_GUID = $(FMP_GRAPHICS_ESRT_GUID) - - DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf + FILE_GUID = $(SYSTEM_FMP_ESRT_GUID) } FmpDevicePkg/FmpDxe/FmpDxe.inf { @@ -128,9 +126,7 @@ # # FILE_GUID is used as ESRT GUID # - FILE_GUID = $(FMP_TEXT_ESRT_GUID) - - DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibText/DisplayUpdateProgressLibText.inf + FILE_GUID = $(DEVICE_FMP_ESRT_GUID) } [BuildOptions] -- 2.39.2