[edk2-devel][edk2-platforms][PATCH V1 08/11] SimicsOpenBoardPkg/ReportFvLib: Update ReportFvLib

Oram, Isaac W posted 11 patches 4 years, 3 months ago
[edk2-devel][edk2-platforms][PATCH V1 08/11] SimicsOpenBoardPkg/ReportFvLib: Update ReportFvLib
Posted by Oram, Isaac W 4 years, 3 months ago
Update file naming to match other ReportFvLib implementations.
Also fix duplicate GUID for libary name.

Cc: Agyeman Prince <prince.agyeman@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc                                                |  2 +-
 Platform/Intel/SimicsOpenBoardPkg/Library/{PeiReportFvLib => ReportFvLib}/Fv.c                                  |  0
 Platform/Intel/SimicsOpenBoardPkg/Library/{PeiReportFvLib/PeiReportFvLib.c => ReportFvLib/ReportFvLibPei.c}     |  0
 Platform/Intel/SimicsOpenBoardPkg/Library/{PeiReportFvLib/PeiReportFvLib.inf => ReportFvLib/ReportFvLibPei.inf} | 10 +++++-----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
index 93a7d1df55..bfd0320daf 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
@@ -117,7 +117,6 @@
   DxeLoadLinuxLib|$(BOARD_PKG)/Library/LoadLinuxLib/DxeLoadLinuxLib.inf
   LogoLib|$(BOARD_PKG)/Library/DxeLogoLib/DxeLogoLib.inf
   NvVarsFileLib|$(BOARD_PKG)/Library/NvVarsFileLib/NvVarsFileLib.inf
-  ReportFvLib|$(BOARD_PKG)/Library/PeiReportFvLib/PeiReportFvLib.inf
   SerializeVariablesLib|$(BOARD_PKG)/Library/SerializeVariablesLib/SerializeVariablesLib.inf
   SiliconPolicyInitLib|$(BOARD_PKG)/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
   SiliconPolicyUpdateLib|$(BOARD_PKG)/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
@@ -151,6 +150,7 @@
 !endif
   TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/PeiTestPointLib.inf
   SetCacheMtrrLib|$(PLATFORM_PACKAGE)/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
+  ReportFvLib|$(BOARD_PKG)/Library/ReportFvLib/ReportFvLibPei.inf
 
 [LibraryClasses.common.DXE_DRIVER]
 
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/Fv.c b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/Fv.c
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/Fv.c
rename to Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/Fv.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.c
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
rename to Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.inf b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.inf
similarity index 84%
rename from Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.inf
rename to Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.inf
index 5d2e39532c..524ecf2847 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.inf
@@ -1,7 +1,7 @@
 ### @file
 # Component information file for the Report Firmware Volume (FV) library.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -9,11 +9,11 @@
 
 [Defines]
   INF_VERSION                    = 0x00010017
-  BASE_NAME                      = PeiReportFvLib
-  FILE_GUID                      = 44328FA5-E4DD-4A15-ABDF-C6584AC363D9
+  BASE_NAME                      = ReportFvLibPei
+  FILE_GUID                      = 409fc85f-aec0-4a8f-8126-9c36d201b5c4
   VERSION_STRING                 = 1.0
   MODULE_TYPE                    = PEIM
-  LIBRARY_CLASS                  = ReportFvLib
+  LIBRARY_CLASS                  = ReportFvLib | PEIM
 
 [LibraryClasses]
   BaseMemoryLib
@@ -32,7 +32,7 @@
   SimicsIch10Pkg/Ich10Pkg.dec
 
 [Sources]
-  PeiReportFvLib.c
+  ReportFvLibPei.c
   Fv.c
 
 [Pcd]
-- 
2.27.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82167): https://edk2.groups.io/g/devel/message/82167
Mute This Topic: https://groups.io/mt/86360120/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel][edk2-platforms][PATCH V1 08/11] SimicsOpenBoardPkg/ReportFvLib: Update ReportFvLib
Posted by Nate DeSimone 4 years, 3 months ago
Hi Isaac,

Unlike the other platforms, you don't have a SMM and a PEI implementation in the same directory here. Therefore, why take the "Pei" prefix off the directory name here? Since this is a PEI specific implementation of a generic LibraryClass, it is convention to keep the "Pei" prefix. For an example of this see:

https://github.com/tianocore/edk2/tree/master/MdeModulePkg/Library/PeiReportStatusCodeLib
https://github.com/tianocore/edk2/tree/master/MdeModulePkg/Library/DxeReportStatusCodeLib

Accordingly, the path SimicsOpenBoardPkg/Library/PeiReportFvLib should be retained.

Thanks,
Nate

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Oram,
> Isaac W
> Sent: Friday, October 15, 2021 2:26 PM
> To: devel@edk2.groups.io
> Cc: Agyeman, Prince <prince.agyeman@intel.com>
> Subject: [edk2-devel][edk2-platforms][PATCH V1 08/11]
> SimicsOpenBoardPkg/ReportFvLib: Update ReportFvLib
> 
> Update file naming to match other ReportFvLib implementations.
> Also fix duplicate GUID for libary name.
> 
> Cc: Agyeman Prince <prince.agyeman@intel.com>
> Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
> ---
>  Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> |  2 +-
>  Platform/Intel/SimicsOpenBoardPkg/Library/{PeiReportFvLib =>
> ReportFvLib}/Fv.c                                  |  0
> 
> Platform/Intel/SimicsOpenBoardPkg/Library/{PeiReportFvLib/PeiReportFvLib
> .c => ReportFvLib/ReportFvLibPei.c}     |  0
> 
> Platform/Intel/SimicsOpenBoardPkg/Library/{PeiReportFvLib/PeiReportFvLib
> .inf => ReportFvLib/ReportFvLibPei.inf} | 10 +++++-----
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> index 93a7d1df55..bfd0320daf 100644
> ---
> a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> +++
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
> @@ -117,7 +117,6 @@
> 
> DxeLoadLinuxLib|$(BOARD_PKG)/Library/LoadLinuxLib/DxeLoadLinuxLib.inf
>    LogoLib|$(BOARD_PKG)/Library/DxeLogoLib/DxeLogoLib.inf
>    NvVarsFileLib|$(BOARD_PKG)/Library/NvVarsFileLib/NvVarsFileLib.inf
> -  ReportFvLib|$(BOARD_PKG)/Library/PeiReportFvLib/PeiReportFvLib.inf
> 
> SerializeVariablesLib|$(BOARD_PKG)/Library/SerializeVariablesLib/SerializeV
> ariablesLib.inf
> 
> SiliconPolicyInitLib|$(BOARD_PKG)/Policy/Library/SiliconPolicyInitLib/SiliconP
> olicyInitLib.inf
> 
> SiliconPolicyUpdateLib|$(BOARD_PKG)/Policy/Library/SiliconPolicyUpdateLib
> /SiliconPolicyUpdateLib.inf
> @@ -151,6 +150,7 @@
>  !endif
> 
> TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/PeiTestPoi
> ntLib.inf
> 
> SetCacheMtrrLib|$(PLATFORM_PACKAGE)/Library/SetCacheMtrrLib/SetCac
> heMtrrLib.inf
> +  ReportFvLib|$(BOARD_PKG)/Library/ReportFvLib/ReportFvLibPei.inf
> 
>  [LibraryClasses.common.DXE_DRIVER]
> 
> diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/Fv.c
> b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/Fv.c
> similarity index 100%
> rename from
> Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/Fv.c
> rename to Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/Fv.c
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLi
> b.c
> b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.c
> similarity index 100%
> rename from
> Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.
> c
> rename to
> Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.c
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLi
> b.inf
> b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.i
> nf
> similarity index 84%
> rename from
> Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.
> inf
> rename to
> Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibPei.inf
> index 5d2e39532c..524ecf2847 100644
> ---
> a/Platform/Intel/SimicsOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLi
> b.inf
> +++
> b/Platform/Intel/SimicsOpenBoardPkg/Library/ReportFvLib/ReportFvLibP
> +++ ei.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Component information file for the Report Firmware Volume (FV) library.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2021, Intel Corporation. All rights
> +reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent  # @@ -9,11 +9,11 @@
> 
>  [Defines]
>    INF_VERSION                    = 0x00010017
> -  BASE_NAME                      = PeiReportFvLib
> -  FILE_GUID                      = 44328FA5-E4DD-4A15-ABDF-C6584AC363D9
> +  BASE_NAME                      = ReportFvLibPei
> +  FILE_GUID                      = 409fc85f-aec0-4a8f-8126-9c36d201b5c4
>    VERSION_STRING                 = 1.0
>    MODULE_TYPE                    = PEIM
> -  LIBRARY_CLASS                  = ReportFvLib
> +  LIBRARY_CLASS                  = ReportFvLib | PEIM
> 
>  [LibraryClasses]
>    BaseMemoryLib
> @@ -32,7 +32,7 @@
>    SimicsIch10Pkg/Ich10Pkg.dec
> 
>  [Sources]
> -  PeiReportFvLib.c
> +  ReportFvLibPei.c
>    Fv.c
> 
>  [Pcd]
> --
> 2.27.0.windows.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82555): https://edk2.groups.io/g/devel/message/82555
Mute This Topic: https://groups.io/mt/86360120/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-