From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web09.625.1635453939768446912 for ; Thu, 28 Oct 2021 13:45:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=FCGqw8/9; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (c-73-27-179-174.hsd1.fl.comcast.net [73.27.179.174]) by linux.microsoft.com (Postfix) with ESMTPSA id 25808208F4E9; Thu, 28 Oct 2021 13:45:39 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 25808208F4E9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1635453939; bh=PHd2DuILDMLm4VtETIoC4WQFlChJjILV69MzfjO75q0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCGqw8/9LWNFXOaDC/yvf9qV5GuVGtFFAIUdfM30SLAsOrohOQVQQz48tTd90pGZx kSBo6ghNoaXBzFWCB1MzPIJU9w9rwvlealg0yrB8Q/30yTLh05TiXjij8zLxt2LvB0 cz1UPPA6e9J2X3Nj8K7w24580jivhDiaTFohanTE= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Nate DeSimone , Chasel Chiu Subject: [PATCH v6 25/52] PurleyOpenBoardPkg: Use IntelSiliconPkg SpiFvbServiceSmm Date: Thu, 28 Oct 2021 16:42:59 -0400 Message-Id: <20211028204326.645-26-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211028204326.645-1-mikuback@linux.microsoft.com> References: <20211028204326.645-1-mikuback@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3307REF:https://bugz= illa.tianocore.org/show_bug.cgi?id=3D3307 Updates the boards in the package to use SpiFvbServicesSmm from IntelSiliconPkg since the MinPlatformPkg driver was moved there. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Michael Kubacki --- Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc | 2 +- Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf | 2 +- Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc | 4 ++= -- Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.fdf | 5 ++= ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPk= g.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc index 98e02f35e7db..39c5cf78abc9 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc @@ -184,7 +184,7 @@ [Components.X64] GCC:*_*_*_ASLCC_FLAGS =3D -D PURLEY_FLAG -D PCH_SPT } =20 - $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf + IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf { diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPk= g.fdf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf index 7a3ffff7ff08..413d98a07065 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf @@ -343,7 +343,7 @@ [FV.FvOsBootUncompact] =20 !include $(PLATFORM_PACKAGE)/Include/Fdf/CoreOsBootInclude.fdf =20 -INF $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf +INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf INF $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf INF $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf =20 diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPk= g.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc index f2a028d18310..3bac6d394e4c 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc @@ -89,7 +89,7 @@ [DefaultStores] [Components.$(DXE_ARCH)] #TiogaPass Override START : Added Board Specific changes in core drivers #!include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc -!include CoreDxeInclude.dsc=20 +!include CoreDxeInclude.dsc #TiogaPass Override END =20 ####################################### @@ -210,7 +210,7 @@ [Components.X64] GCC:*_*_*_ASLCC_FLAGS =3D -D PURLEY_FLAG -D PCH_SPT } =20 - $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf + IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf { diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPk= g.fdf b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.fdf index 3c05b744141b..b162483c44cc 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.fdf +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.fdf @@ -167,6 +167,9 @@ [FD.Platform] SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase =3D gEfiPch= TokenSpaceGuid.PcdFlashAreaBaseAddress + gCpuUncoreTokenSpaceGuid.PcdFlas= hNvStorageMicrocodeBase SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize =3D gCpuUnc= oreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize =20 +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =3D gCpuUnc= oreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D gCpuUnc= oreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize + SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D gEfiPch= TokenSpaceGuid.PcdFlashAreaBaseAddress + gCpuUncoreTokenSpaceGuid.PcdFlas= hNvStorageMicrocodeBase + 0x60 SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D gCpuUnc= oreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize - 0x60 =20 @@ -395,7 +398,7 @@ [FV.FvOsBootUncompact] =20 !include $(PLATFORM_PACKAGE)/Include/Fdf/CoreOsBootInclude.fdf =20 -INF $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf +INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf INF $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf INF $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf =20 --=20 2.28.0.windows.1