From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.3341.1634333146761283299 for ; Fri, 15 Oct 2021 14:25:47 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: isaac.w.oram@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10138"; a="314187521" X-IronPort-AV: E=Sophos;i="5.85,376,1624345200"; d="scan'208";a="314187521" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 14:25:45 -0700 X-IronPort-AV: E=Sophos;i="5.85,376,1624345200"; d="scan'208";a="492709801" Received: from iworam-desk.amr.corp.intel.com ([10.7.150.79]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 14:25:44 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Chasel Chiu , Nate DeSimone Subject: [edk2-devel][edk2-platforms][PATCH V1 07/11] PurleyOpenBoardPkg/ReportFvLib: Update ReportFvLib Date: Fri, 15 Oct 2021 14:25:30 -0700 Message-Id: <40ba147026c4f81af8865bae966c3908ff187154.1634331939.git.isaac.w.oram@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update custom ReportFvLib to match other board implementations. Also fix duplicate GUID for libary name. Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Isaac Oram --- Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc | 1 - Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/{PeiReportFvLib/PeiReportFvLib.c => ReportFvLib/ReportFvLibPei.c} | 10 +++++++--- Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/{PeiReportFvLib/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.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc index 98e02f35e7..ca747737e4 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc @@ -105,7 +105,6 @@ PlatformBootManagerLib|$(PLATFORM_BOARD_PACKAGE)/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf !endif - ReportFvLib|$(PLATFORM_PACKAGE)/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf CompressLib|$(PLATFORM_PACKAGE)/Library/CompressLib/CompressLib.inf diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFvLib/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/ReportFvLibPei.c index ee4fce0b5c..706bcb02ff 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFvLib/PeiReportFvLib.c +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvLib/ReportFvLibPei.c @@ -1,9 +1,13 @@ /** @file + Source code file for Report Firmware Volume (FV) library -Copyright (c) 2018, Intel Corporation. All rights reserved.
-Copyright (c) 2021, American Megatrends International LLC.
-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.
+ Copyright (c) 2021, American Megatrends International LLC.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFvLib/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/ReportFvLibPei.inf index 1aab8ae702..adcf8d8cfd 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/PeiReportFvLib/PeiReportFvLib.inf +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/Library/ReportFvLib/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.
+# Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved.
# Copyright (c) 2021, American Megatrends International LLC.
+# # 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.
+# Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved.
# Copyright (c) 2021, American Megatrends International LLC.
# 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/LinuxBootNull.inf -!endif +!endif !if gPlatformTokenSpaceGuid.PcdFastBoot == FALSE PlatformBootManagerLib|$(PLATFORM_PACKAGE)/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf @@ -117,7 +117,7 @@ PlatformBootManagerLib|$(PLATFORM_BOARD_PACKAGE)/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf !endif - ReportFvLib|$(PROJECT)/Library/PeiReportFvLib/PeiReportFvLib.inf + ReportFvLib|$(PROJECT)/Library/ReportFvLib/ReportFvLibPei.inf TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf CompressLib|$(PLATFORM_PACKAGE)/Library/CompressLib/CompressLib.inf -- 2.27.0.windows.1