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 <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
index 525640de2e1b180d7e09ec4ec9a6d1a7258f80a6..8d2436627dae382940b11ff54a476ef2a6d20022 100644 (file)
--- a/FmpDevicePkg/FmpDevicePkg.dsc
+++ b/FmpDevicePkg/FmpDevicePkg.dsc
@@ -43,8 +43,8 @@
   #\r
   # Define ESRT GUIDs for Firmware Management Protocol instances\r
   #\r
   #\r
   # Define ESRT GUIDs for Firmware Management Protocol instances\r
   #\r

-  DEFINE FMP_GRAPHICS_ESRT_GUID  = B461B3BD-E62A-4A71-841C-50BA4E500267\r
-  DEFINE FMP_TEXT_ESRT_GUID      = 226034C4-8B67-4536-8653-D6EE7CE5A316\r
+  DEFINE SYSTEM_FMP_ESRT_GUID   = B461B3BD-E62A-4A71-841C-50BA4E500267\r
+  DEFINE DEVICE_FMP_ESRT_GUID   = 226034C4-8B67-4536-8653-D6EE7CE5A316\r

 \r
 [LibraryClasses]\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
 \r
 [LibraryClasses]\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r


@@ -116,11 +116,9 @@
   FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
     <Defines>\r
       #\r
   FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
     <Defines>\r
       #\r

-      # FILE_GUID is FMP ESRT GUID\r
+      # FILE_GUID is used as ESRT GUID\r

       #\r
       #\r

-      FILE_GUID = $(FMP_GRAPHICS_ESRT_GUID)\r
-    <LibraryClasses>\r
-      DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf\r
+      FILE_GUID = $(SYSTEM_FMP_ESRT_GUID)\r

   }\r
 \r
   FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
   }\r
 \r
   FmpDevicePkg/FmpDxe/FmpDxe.inf {\r


@@ -128,9 +126,7 @@
       #\r
       # FILE_GUID is used as ESRT GUID\r
       #\r
       #\r
       # FILE_GUID is used as ESRT GUID\r
       #\r

-      FILE_GUID = $(FMP_TEXT_ESRT_GUID)\r
-    <LibraryClasses>\r
-      DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibText/DisplayUpdateProgressLibText.inf\r
+      FILE_GUID = $(DEVICE_FMP_ESRT_GUID)\r

   }\r
 \r
 [BuildOptions]\r
   }\r
 \r
 [BuildOptions]\r