FmpDevicePkg/FmpDevicePkg.dsc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
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>
---
FmpDevicePkg/FmpDevicePkg.dsc | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
index 525640de2e1b..8d2436627dae 100644
--- a/FmpDevicePkg/FmpDevicePkg.dsc
+++ b/FmpDevicePkg/FmpDevicePkg.dsc
@@ -43,8 +43,8 @@ [Defines]
#
# 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 @@ [Components]
FmpDevicePkg/FmpDxe/FmpDxe.inf {
<Defines>
#
- # FILE_GUID is FMP ESRT GUID
+ # FILE_GUID is used as ESRT GUID
#
- FILE_GUID = $(FMP_GRAPHICS_ESRT_GUID)
- <LibraryClasses>
- DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
+ FILE_GUID = $(SYSTEM_FMP_ESRT_GUID)
}
FmpDevicePkg/FmpDxe/FmpDxe.inf {
@@ -128,9 +126,7 @@ [Components]
#
# FILE_GUID is used as ESRT GUID
#
- FILE_GUID = $(FMP_TEXT_ESRT_GUID)
- <LibraryClasses>
- DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibText/DisplayUpdateProgressLibText.inf
+ FILE_GUID = $(DEVICE_FMP_ESRT_GUID)
}
[BuildOptions]
--
2.7.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> Mike > -----Original Message----- > From: Zeng, Star > Sent: Friday, July 27, 2018 6:14 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D > <michael.d.kinney@intel.com> > Subject: [staging/FmpDevicePkg-master][PATCH] > 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> > --- > FmpDevicePkg/FmpDevicePkg.dsc | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/FmpDevicePkg/FmpDevicePkg.dsc > b/FmpDevicePkg/FmpDevicePkg.dsc > index 525640de2e1b..8d2436627dae 100644 > --- a/FmpDevicePkg/FmpDevicePkg.dsc > +++ b/FmpDevicePkg/FmpDevicePkg.dsc > @@ -43,8 +43,8 @@ [Defines] > # > # 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/UefiDriverEntryPoin > t/UefiDriverEntryPoint.inf > @@ -116,11 +116,9 @@ [Components] > FmpDevicePkg/FmpDxe/FmpDxe.inf { > <Defines> > # > - # FILE_GUID is FMP ESRT GUID > + # FILE_GUID is used as ESRT GUID > # > - FILE_GUID = $(FMP_GRAPHICS_ESRT_GUID) > - <LibraryClasses> > - > DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUp > dateProgressLibGraphics/DisplayUpdateProgressLibGraphic > s.inf > + FILE_GUID = $(SYSTEM_FMP_ESRT_GUID) > } > > FmpDevicePkg/FmpDxe/FmpDxe.inf { > @@ -128,9 +126,7 @@ [Components] > # > # FILE_GUID is used as ESRT GUID > # > - FILE_GUID = $(FMP_TEXT_ESRT_GUID) > - <LibraryClasses> > - > DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUp > dateProgressLibText/DisplayUpdateProgressLibText.inf > + FILE_GUID = $(DEVICE_FMP_ESRT_GUID) > } > > [BuildOptions] > -- > 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.