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.web08.3871.1618540378592591598 for ; Thu, 15 Apr 2021 19:32:58 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=p5LUEeVG; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [167.220.2.74]) by linux.microsoft.com (Postfix) with ESMTPSA id 5B5A120B8002; Thu, 15 Apr 2021 19:32:58 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5B5A120B8002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1618540378; bh=9feT6tYNzCyOpxz9vH9EnMHpe7j+L/pbbemoslNwzg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p5LUEeVGLsOaODwrnpIE3davAaB7mMsAmbPvdPC6Oaejcx/qEd0gfeid9bd92JySi fpi3EgE0ZNCT931ViyQz82pBxvaL7zXyV7qjPX0F/PBdcV6pmiWYYdwPj/u0GgBX82 4t/GWQDCR6/APkBoL8nr5zbftYOm+6vajeqVr0ck= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Agyeman Prince Subject: [edk2-platforms][PATCH v1 18/35] SimicsIch10Pkg: Use IntelSiliconPkg BIOS area and ucode PCDs Date: Thu, 15 Apr 2021 19:31:35 -0700 Message-Id: <20210416023152.771-19-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210416023152.771-1-mikuback@linux.microsoft.com> References: <20210416023152.771-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=3D3307 Updates PCDs to use the IntelSiliconPkg PCD tokenspace now that the PCDs are declared in IntelSiliconPkg.dec. The previous PCDs are removed from Ich10Pkg.dec. Cc: Agyeman Prince Signed-off-by: Michael Kubacki --- Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCommo= n.c | 2 +- Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec = | 6 ------ Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/BasePchS= piCommonLib.inf | 5 +++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommon= Lib/SpiCommon.c b/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiC= ommonLib/SpiCommon.c index 3e7dffedfbe9..f2907ef53bfc 100644 --- a/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/Spi= Common.c +++ b/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/Spi= Common.c @@ -69,7 +69,7 @@ SpiProtocolConstructor ( SpiInstance->WritePermis= sion)); =20 // - SpiInstance->TotalFlashSize =3D PcdGet32(PcdFlashAreaSize); + SpiInstance->TotalFlashSize =3D PcdGet32 (PcdBiosSize); DEBUG ((DEBUG_INFO, "Total Flash Size : %0x\n", SpiInstance->TotalFlas= hSize)); return EFI_SUCCESS; } diff --git a/Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec b/Silicon/Intel/Si= micsIch10Pkg/Ich10Pkg.dec index 0eb2e5530c3a..8d395a8b4370 100644 --- a/Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec +++ b/Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec @@ -16,11 +16,5 @@ [Includes] =20 [Ppis] =20 -[Guids] - gEfiPchTokenSpaceGuid =3D { 0x89a1b278, 0xa1a1, 0x4df7, { 0xb1, 0x37, = 0xde, 0x5a, 0xd7, 0xc4, 0x79, 0x13 } } [Protocols] gEfiSmmSpiProtocolGuid =3D {0xbd75fe35, 0xfdce, 0x49d7, {0xa9, 0xdd, 0= xb2, 0x6f, 0x1f, 0xc6, 0xb4, 0x37}} - -[PcdsFixedAtBuild] - gEfiPchTokenSpaceGuid.PcdFlashAreaBaseAddress|0xFFE00000|UINT32|0x1000= 0001 - gEfiPchTokenSpaceGuid.PcdFlashAreaSize|0x00200000|UINT32|0x10000002 \ No newline at end of file diff --git a/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommon= Lib/BasePchSpiCommonLib.inf b/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate= /BasePchSpiCommonLib/BasePchSpiCommonLib.inf index df1da274a642..b5aa13c1c56d 100644 --- a/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/Bas= ePchSpiCommonLib.inf +++ b/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/Bas= ePchSpiCommonLib.inf @@ -20,6 +20,7 @@ [Sources] =20 [Packages] MdePkg/MdePkg.dec + IntelSiliconPkg/IntelSiliconPkg.dec SimicsIch10Pkg/Ich10Pkg.dec =20 [LibraryClasses] @@ -27,5 +28,5 @@ [LibraryClasses] DebugLib =20 [Pcd] - gEfiPchTokenSpaceGuid.PcdFlashAreaBaseAddress ## CONSUMES - gEfiPchTokenSpaceGuid.PcdFlashAreaSize ## CONSUMES + gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress ## CONSUMES + gIntelSiliconPkgTokenSpaceGuid.PcdBiosSize ## CONSUMES --=20 2.28.0.windows.1