public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael Kubacki" <mikuback@linux.microsoft.com>
To: devel@edk2.groups.io
Cc: Chasel Chiu <chasel.chiu@intel.com>,
	Nate DeSimone <nathaniel.l.desimone@intel.com>,
	Rangasai V Chaganty <rangasai.v.chaganty@intel.com>,
	Deepika Kethi Reddy <deepika.kethi.reddy@intel.com>,
	Kathappan Esakkithevar <kathappan.esakkithevar@intel.com>
Subject: [edk2-platforms][PATCH v2 20/35] CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
Date: Tue, 18 May 2021 20:59:32 -0700	[thread overview]
Message-ID: <20210519035947.1234-21-mikuback@linux.microsoft.com> (raw)
In-Reply-To: <20210519035947.1234-1-mikuback@linux.microsoft.com>

From: Michael Kubacki <michael.kubacki@microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3307

Updates CometlakeOpenBoardPkg to use the SmmSpiFlashCommonLib
instance in IntelSiliconPkg and the SpiFvbServiceSmm driver in
IntelSiliconPkg.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@intel.com>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc | 7 +++++--
 Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.fdf | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc
index 44a1bd54d6e9..316100e9a599 100644
--- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc
+++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc
@@ -254,7 +254,7 @@ [LibraryClasses.X64.DXE_SMM_DRIVER]
   #######################################
   # Silicon Initialization Package
   #######################################
-  SpiFlashCommonLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
+  SpiFlashCommonLib|IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
 
   #######################################
   # Platform Package
@@ -401,6 +401,10 @@ [Components.X64]
   $(PLATFORM_SI_PACKAGE)/SystemAgent/SaInit/Dxe/SaInitDxe.inf
   $(PLATFORM_SI_BIN_PACKAGE)/Microcode/MicrocodeUpdates.inf
 
+!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
+  IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
+!endif
+
   #######################################
   # Platform Package
   #######################################
@@ -421,7 +425,6 @@ [Components.X64]
 
 !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
 
-  $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
 
   $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.fdf b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.fdf
index 6397d80d3895..e341285f4b1a 100644
--- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.fdf
+++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.fdf
@@ -407,7 +407,7 @@ [FV.FvOsBootUncompact]
 !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
 INF  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
 INF  $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
-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
-- 
2.28.0.windows.1


  parent reply	other threads:[~2021-05-19  4:00 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-19  3:59 [edk2-platforms][PATCH v2 00/35] Consolidate SpiFlashCommonLib instances Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 01/35] CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry Michael Kubacki
2021-05-19  8:58   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 02/35] WhiskeylakeOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 03/35] CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to INF Michael Kubacki
2021-05-19  8:59   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 04/35] IntelSiliconPkg: Add BIOS area base address and size PCDs Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 05/35] IntelSiliconPkg: Add microcode FV PCDs Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 06/35] IntelSiliconPkg: Add PCH SPI PPI Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 07/35] IntelSiliconPkg: Add PCH SPI Protocol Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 08/35] IntelSiliconPkg: Add SpiFlashCommonLib Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 09/35] IntelSiliconPkg: Add SmmSpiFlashCommonLib Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 10/35] IntelSiliconPkg: Add MM SPI FVB services Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 11/35] CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 12/35] KabylakeOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 13/35] SimicsOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 14/35] TigerlakeOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 15/35] WhiskeylakeOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 16/35] CoffeelakeSiliconPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 17/35] KabylakeSiliconPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 18/35] SimicsIch10Pkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 19/35] TigerlakeSiliconPkg: Use IntelSiliconPkg BIOS are " Michael Kubacki
2021-05-19  3:59 ` Michael Kubacki [this message]
2021-05-19  8:58   ` [edk2-platforms][PATCH v2 20/35] CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 21/35] KabylakeOpenBoardPkg: " Michael Kubacki
2021-05-19  8:49   ` [edk2-devel] " Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 22/35] SimicsOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 23/35] TigerlakeOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 24/35] WhiskeylakeOpenBoardPkg: " Michael Kubacki
2021-05-19  8:57   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 25/35] MinPlatformPkg: Remove SpiFvbService modules Michael Kubacki
2021-05-19  8:50   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 26/35] CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 27/35] KabylakeSiliconPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 28/35] SimicsIch10Pkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 29/35] TigerlakeOpenBoardPkg: " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 30/35] MinPlatformPkg: Remove SpiFlashCommonLibNull Michael Kubacki
2021-05-19  8:48   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 31/35] KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add IntelSiliconPkg.dec Michael Kubacki
2021-05-19  8:47   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 32/35] CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from package Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 33/35] KabylakeSiliconPkg: " Michael Kubacki
2021-05-19  8:47   ` Chiu, Chasel
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 34/35] SimicsIch10Pkg: Remove PCH SPI SMM " Michael Kubacki
2021-05-19  3:59 ` [edk2-platforms][PATCH v2 35/35] TigerlakeSiliconPkg: Remove PCH SPI PPI and " Michael Kubacki
2021-05-22  1:04 ` [edk2-platforms][PATCH v2 00/35] Consolidate SpiFlashCommonLib instances Nate DeSimone
2021-05-26 23:57 ` Nate DeSimone
2021-05-27 13:17   ` Michael Kubacki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210519035947.1234-21-mikuback@linux.microsoft.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox