Reviewed-by: Nate DeSimone <[email protected]> > -----Original Message----- > From: Oram, Isaac W <[email protected]> > Sent: Friday, October 15, 2021 2:26 PM > To: [email protected] > Cc: Chiu, Chasel <[email protected]>; Desimone, Nathaniel L > <[email protected]> > Subject: [edk2-devel][edk2-platforms][PATCH V1 07/11] > PurleyOpenBoardPkg/ReportFvLib: Update ReportFvLib > > Update custom ReportFvLib to match other board implementations. > Also fix duplicate GUID for libary name. > > Cc: Chasel Chiu <[email protected]> > Cc: Nate DeSimone <[email protected]> > Signed-off-by: Isaac Oram <[email protected]> > --- > Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc > | 1 - > > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/{PeiReportFvLi > b/PeiReportFvLib.c => ReportFvLib/ReportFvLibPei.c} | 10 +++++++--- > > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/{PeiReportFvLi > b/PeiReportFvLib.inf => ReportFvLib/ReportFvLibPei.inf} | 13 +++++++------ > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > | 8 ++++---- > 4 files changed, 18 insertions(+), 14 deletions(-) > > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.ds > c > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.ds > c > index 98e02f35e7..ca747737e4 100644 > --- > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.ds > c > +++ > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.ds > c > @@ -105,7 +105,6 @@ > > PlatformBootManagerLib|$(PLATFORM_BOARD_PACKAGE)/Override/Platfo > rm/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlat > formBootManagerLib.inf > !endif > > - > ReportFvLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/PeiReportFvLib/P > eiReportFvLib.inf > > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib > Null/TestPointCheckLibNull.inf > > > CompressLib|$(PLATFORM_PACKAGE)/Library/CompressLib/CompressLib.in > f > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFv > Lib/PeiReportFvLib.c > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvLib > /ReportFvLibPei.c > similarity index 90% > rename from > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFvLib > /PeiReportFvLib.c > rename to > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvLib/R > eportFvLibPei.c > index ee4fce0b5c..706bcb02ff 100644 > --- > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFv > Lib/PeiReportFvLib.c > +++ > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvL > +++ ib/ReportFvLibPei.c > @@ -1,9 +1,13 @@ > /** @file > + Source code file for Report Firmware Volume (FV) library > > -Copyright (c) 2018, Intel Corporation. All rights reserved.<BR> -Copyright > (c) > 2021, American Megatrends International LLC.<BR> > -SPDX-License-Identifier: BSD-2-Clause-Patent > + ReportMmFv (); is not supported in this library instance > > + @copyright > + Copyright (c) 2018, - 2021 Intel Corporation. All rights > + reserved.<BR> Copyright (c) 2021, American Megatrends International > + LLC.<BR> > + > + SPDX-License-Identifier: BSD-2-Clause-Patent > **/ > > #include <Base.h> > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFv > Lib/PeiReportFvLib.inf > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvLib > /ReportFvLibPei.inf > similarity index 82% > rename from > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFvLib > /PeiReportFvLib.inf > rename to > Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvLib/R > eportFvLibPei.inf > index 1aab8ae702..adcf8d8cfd 100644 > --- > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFv > Lib/PeiReportFvLib.inf > +++ > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvL > +++ ib/ReportFvLibPei.inf > @@ -1,19 +1,20 @@ > ## @file > +# Component information file for the Report Firmware Volume (FV) library. > # > -# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2018 - 2021, Intel Corporation. All rights > +reserved.<BR> > # Copyright (c) 2021, American Megatrends International LLC.<BR> > +# > # SPDX-License-Identifier: BSD-2-Clause-Patent # ## > > - > [Defines] > INF_VERSION = 0x00010017 > - BASE_NAME = PeiReportFvLib > - FILE_GUID = 44328FA5-E4DD-4A15-ABDF-C6584AC363D9 > + BASE_NAME = ReportFvLibPei > + FILE_GUID = b2f52f32-9963-4f66-8cbf-ddb7a02523ac > VERSION_STRING = 1.0 > MODULE_TYPE = PEIM > - LIBRARY_CLASS = ReportFvLib > + LIBRARY_CLASS = ReportFvLib | PEIM > > [LibraryClasses] > BaseMemoryLib > @@ -27,7 +28,7 @@ > MinPlatformPkg/MinPlatformPkg.dec > > [Sources] > - PeiReportFvLib.c > + ReportFvLibPei.c > > [Pcd] > gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode ## > CONSUMES > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > index f2a028d183..5623cbac41 100644 > --- > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > +++ > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > @@ -1,7 +1,7 @@ > ## @file > # The main build description file for the TiogaPass board. > # > -# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2018 - 2021, Intel Corporation. All rights > +reserved.<BR> > # Copyright (c) 2021, American Megatrends International LLC.<BR> # SPDX- > License-Identifier: BSD-2-Clause-Patent # @@ -89,7 +89,7 @@ > [Components.$(DXE_ARCH)] #TiogaPass Override START : Added Board > Specific changes in core drivers #!include > $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc > -!include CoreDxeInclude.dsc > +!include CoreDxeInclude.dsc > #TiogaPass Override END > > ####################################### > @@ -109,7 +109,7 @@ > LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf > !else > > LinuxBootLib|$(PLATFORM_BOARD_PACKAGE)/Features/LinuxBoot/LinuxBo > otNull.inf > -!endif > +!endif > > !if gPlatformTokenSpaceGuid.PcdFastBoot == FALSE > > PlatformBootManagerLib|$(PLATFORM_PACKAGE)/Bds/Library/DxePlatfor > mBootManagerLib/DxePlatformBootManagerLib.inf > @@ -117,7 +117,7 @@ > > PlatformBootManagerLib|$(PLATFORM_BOARD_PACKAGE)/Override/Platfo > rm/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlat > formBootManagerLib.inf > !endif > > - ReportFvLib|$(PROJECT)/Library/PeiReportFvLib/PeiReportFvLib.inf > + ReportFvLib|$(PROJECT)/Library/ReportFvLib/ReportFvLibPei.inf > > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib > Null/TestPointCheckLibNull.inf > > > CompressLib|$(PLATFORM_PACKAGE)/Library/CompressLib/CompressLib.in > f > -- > 2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82554): https://edk2.groups.io/g/devel/message/82554 Mute This Topic: https://groups.io/mt/86360115/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
