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: Agyeman Prince <prince.agyeman@intel.com>,
	Nate DeSimone <nathaniel.l.desimone@intel.com>
Subject: [edk2-platforms][PATCH v3 22/41] SimicsOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
Date: Thu, 17 Jun 2021 22:07:07 -0400	[thread overview]
Message-ID: <20210618020726.5991-23-mikuback@linux.microsoft.com> (raw)
In-Reply-To: <20210618020726.5991-1-mikuback@linux.microsoft.com>

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

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

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

Cc: Agyeman Prince <prince.agyeman@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
 Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 6 ++----
 Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
index 93a7d1df55ae..a3c54a19739c 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
@@ -169,7 +169,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]
   #######################################
   # Silicon Initialization Package
   #######################################
-  SpiFlashCommonLib|$(PCH_PKG)/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
+  SpiFlashCommonLib|IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
 
 #######################################
 # PEI Components
@@ -288,6 +288,7 @@ [Components.X64]
   $(PCH_PKG)/SmmControl/RuntimeDxe/SmmControl2Dxe.inf
   $(PCH_PKG)/Spi/Smm/PchSpiSmm.inf
   $(SKT_PKG)/Smm/Access/SmmAccess2Dxe.inf
+  IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
 !endif
 
   #####################################
@@ -295,9 +296,6 @@ [Components.X64]
   #####################################
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
-!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
-  $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf
-!endif
 
   #######################################
   # Board Package
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
index 99bf60777553..1719513d3ac2 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
@@ -210,7 +210,7 @@ [FV.DXEFV]
 
 INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
 INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-INF  MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
+INF  IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
 INF  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
 INF  BoardModulePkg/LegacySioDxe/LegacySioDxe.inf
 INF  BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf
-- 
2.28.0.windows.1


  parent reply	other threads:[~2021-06-18  2:08 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18  2:06 [edk2-platforms][PATCH v3 00/41] Consolidate SpiFlashCommonLib instances Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 01/41] CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 02/41] WhiskeylakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 03/41] CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to INF Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 04/41] IntelSiliconPkg: Add BIOS area base address and size PCDs Michael Kubacki
2021-06-24 21:42   ` Chaganty, Rangasai V
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 05/41] IntelSiliconPkg: Add microcode FV PCDs Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 06/41] IntelSiliconPkg: Add PCH SPI PPI Michael Kubacki
2021-06-24 21:56   ` Chaganty, Rangasai V
2021-06-25  1:55     ` Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 07/41] IntelSiliconPkg: Add PCH SPI Protocol Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 08/41] IntelSiliconPkg: Add SpiFlashCommonLib Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 09/41] IntelSiliconPkg: Add SmmSpiFlashCommonLib Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 10/41] IntelSiliconPkg: Add MM SPI FVB services Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 11/41] CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 12/41] KabylakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 13/41] SimicsOpenBoardPkg: " Michael Kubacki
2021-06-18  2:06 ` [edk2-platforms][PATCH v3 14/41] TigerlakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 15/41] WhiskeylakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 16/41] CoffeelakeSiliconPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 17/41] KabylakeSiliconPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 18/41] SimicsIch10Pkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 19/41] TigerlakeSiliconPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 20/41] CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 21/41] KabylakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:07 ` Michael Kubacki [this message]
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 23/41] TigerlakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 24/41] WhiskeylakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 25/41] MinPlatformPkg: Remove SpiFvbService modules Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 26/41] CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 27/41] KabylakeSiliconPkg: " Michael Kubacki
2021-06-18 11:38   ` Chiu, Chasel
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 28/41] SimicsIch10Pkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 29/41] TigerlakeOpenBoardPkg: " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 30/41] MinPlatformPkg: Remove SpiFlashCommonLibNull Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 31/41] KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add IntelSiliconPkg.dec Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 32/41] CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from package Michael Kubacki
2021-06-18 11:39   ` Chiu, Chasel
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 33/41] KabylakeSiliconPkg: " Michael Kubacki
2021-06-18 11:39   ` Chiu, Chasel
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 34/41] SimicsIch10Pkg: Remove PCH SPI SMM " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 35/41] TigerlakeSiliconPkg: Remove PCH SPI PPI and " Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 36/41] IntelSiliconPkg: Add flash region GUIDs Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 37/41] IntelSiliconPkg: Identify flash regions by GUID Michael Kubacki
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 38/41] CoffeelakeSiliconPkg/BasePchSpiCommonLib: " Michael Kubacki
2021-06-18 11:53   ` Chiu, Chasel
2021-06-18  2:07 ` [edk2-platforms][PATCH v3 39/41] KabylakeSiliconPkg: " Michael Kubacki
2021-06-18 11:55   ` Chiu, Chasel

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=20210618020726.5991-23-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