[edk2-platforms][PATCH v4 00/41] Consolidate SpiFlashCommonLib instances


Nate DeSimone
 

Hi Michael,

I have not tried actually. Now that TiogaPass has been merged upstream we have not been focusing on Mt. Olympus. I believe the original code was pair programmed by Mallik and Jiewen and neither of them seem to be interested in continuing maintenance of it. We are planning on deprecating and removing Mt. Olympus since it is unmaintained, unless someone else from Microsoft is interested in picking up maintenance of it again.

Thanks,
Nate

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
Kubacki
Sent: Monday, August 2, 2021 11:24 AM
To: Desimone, Nathaniel L <nathaniel.l.desimone@...>;
devel@edk2.groups.io
Cc: Agyeman, Prince <prince.agyeman@...>; Chiu, Chasel
<chasel.chiu@...>; Kethi Reddy, Deepika
<deepika.kethi.reddy@...>; Dong, Eric <eric.dong@...>; Luo,
Heng <heng.luo@...>; Jeremy Soller <jeremy@...>;
Esakkithevar, Kathappan <kathappan.esakkithevar@...>; Liming Gao
<gaoliming@...>; Chaganty, Rangasai V
<rangasai.v.chaganty@...>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH v4 00/41] Consolidate
SpiFlashCommonLib instances

Hi Nate,

Does BoardMtOlympus in edk2-platforms/master build for you?

It looks like some additional microcode patches were added and the
microcode FV was not expanded.

Generating MICROCODE_FV FV
Return Value = 2
GenFv: ERROR 3000: Invalid
the required fv image size 0x22460 exceeds the set fv image size
0x10000

- Michael

On 7/28/2021 8:08 PM, Michael Kubacki wrote:
Sure. These packages were added to edk2-platforms throughout the
lifetime of this patch series.

Hopefully this is the last rebase...

Regards,
Michael

On 7/28/2021 7:58 PM, Desimone, Nathaniel L wrote:
Hi Michael,

The change content looks good. However, after applying your patch
series PurleyOpenBoardPkg and WhitleyOpenBoardPkg no longer
compile.
Can you please fix these build errors?

For your reference, these are the tests that I ran:

build_bios.py -p BoardMtOlympus -t VS2015x86 -d build_bios.py -p
WilsonCityRvp -t VS2015x86 -d

Thanks,
Nate

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
Michael Kubacki
Sent: Friday, June 25, 2021 2:21 PM
To: devel@edk2.groups.io
Cc: Agyeman, Prince <prince.agyeman@...>; Chiu, Chasel
<chasel.chiu@...>; Kethi Reddy, Deepika
<deepika.kethi.reddy@...>; Dong, Eric <eric.dong@...>;
Luo, Heng <heng.luo@...>; Jeremy Soller
<jeremy@...>;
Esakkithevar, Kathappan <kathappan.esakkithevar@...>; Liming
Gao <gaoliming@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>; Chaganty, Rangasai V
<rangasai.v.chaganty@...>
Subject: [edk2-devel] [edk2-platforms][PATCH v4 00/41] Consolidate
SpiFlashCommonLib instances

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

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

SpiFlashCommonLib is duplicated in multiple places across the
MinPlatform design in edk2-platforms. I'm planning to build some
additional functionality on top of SpiFlashCommonLib and, ideally,
this duplication will be consolidated into a single instance usable
across all current library consumers.

This patch series focuses on consolidating the various
SpiFlashCommonLib instances as agreed upon in
https://edk2.groups.io/g/devel/message/71701.

Read the BZ for more general background around this series.

I only have an UpXtreme board on hand so maintainers/reviewers of
other board packages should test these changes on those boards.

V4 changes:
- Assigned new GUID values to the PCH SPI PPI and Protocols to
   differentiate from previous instances. This was done because
   the interface changed to identify SPI flash regions by GUID.

V3 changes:
- Added support to IntelSiliconPkg to identify flash regions by GUID
as
   requested in v2 review feedback.
V2 changes:
- Rebased patch series on current edk2-platforms master
(32183bdaa91)

Note: Previous patch series only received a couple review comments
after being on the mailing list for over 2 months. Please be
respectful of contributors time and efforts and review in a timely
manner.

Cc: Agyeman Prince <prince.agyeman@...>
Cc: Chasel Chiu <chasel.chiu@...>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@...>
Cc: Eric Dong <eric.dong@...>
Cc: Heng Luo <heng.luo@...>
Cc: Jeremy Soller <jeremy@...>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@...>
Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
Michael Kubacki (41):
   CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec
entry
   WhiskeylakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec
entry
   CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to
INF
   IntelSiliconPkg: Add BIOS area base address and size PCDs
   IntelSiliconPkg: Add microcode FV PCDs
   IntelSiliconPkg: Add PCH SPI PPI
   IntelSiliconPkg: Add PCH SPI Protocol
   IntelSiliconPkg: Add SpiFlashCommonLib
   IntelSiliconPkg: Add SmmSpiFlashCommonLib
   IntelSiliconPkg: Add MM SPI FVB services
   CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode
PCDs
   KabylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode
PCDs
   SimicsOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   TigerlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode
PCDs
   WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode
PCDs
   CoffeelakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode
PCDs
   KabylakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   SimicsIch10Pkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   TigerlakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   CometlakeOpenBoardPkg: Update SpiFvbService &
SpiFlashCommonLib
   KabylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   SimicsOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   TigerlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   WhiskeylakeOpenBoardPkg: Update SpiFvbService &
SpiFlashCommonLib
   MinPlatformPkg: Remove SpiFvbService modules
   CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib
   KabylakeSiliconPkg: Remove SmmSpiFlashCommonLib
   SimicsIch10Pkg: Remove SmmSpiFlashCommonLib
   TigerlakeOpenBoardPkg: Remove SmmSpiFlashCommonLib
   MinPlatformPkg: Remove SpiFlashCommonLibNull
   KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add
IntelSiliconPkg.dec
   CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from
package
   KabylakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
   SimicsIch10Pkg: Remove PCH SPI SMM Protocol from package
   TigerlakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
   IntelSiliconPkg: Add flash region GUIDs
   IntelSiliconPkg: Identify flash regions by GUID
   CoffeelakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions
by
     GUID
   KabylakeSiliconPkg: Identify flash regions by GUID
   SimicsIch10Pkg/BasePchSpiCommonLib: Identify flash regions by
GUID
   TigerlakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions
by
     GUID


Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCom
monLi

b/SpiCommon.c
| 144 ++++++++--

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c
| 196 -------------

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c
|  54 ----
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c
|   0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceCom

mon.c                                                            |
4 +-
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceMm

.c                                                                |
8 +-
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceStan

daloneMm.c                                                      |
0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceTrad

itionalMm.c                                                     |
0

Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Sp
i
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFla
shC
ommonLib.c |   2 +-
  {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlash
Com mon.c                                                         |
7 +-
  {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlas
hComm

onLibNull.c                                                  |  12
+-

Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
c
| 106 ++++++-

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c
| 196 -------------

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c
|  54 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
SpiCommon.c
| 140 +++++++--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c
| 194 -------------

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c
|  54 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCom
mon.c
| 165 ++++++++---
  Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c
|   4 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpi
Common

Lib/SpiCommon.c
| 176
++++++++++--
  Platform/Intel/CometlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/Fdf/Flash
MapInclude.fdf
|   4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.d
sc
|   7 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.f
df
|  38 +--

Platform/Intel/CometlakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/
PeiPolicyUpdateLib.inf
|   2 +-

Platform/Intel/CometlakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInit
Dxe.i

nf
|   4 +-
  Platform/Intel/KabylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   4 +-

Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapIn
clude.fdf
|   4 +-
  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.ds
c
|   7 +-
  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
|  40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa
pInclude.fdf
|   4 +-
  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.
dsc
|   7 +-
  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.
fdf
|  40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilic
onPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
|
4 +-

Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash
/PeiS

erialPortLibSpiFlash.inf
|   1 +
  Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
|  98 -------
  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
|   2 -
  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
|   6 -
  Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.ds
c
|   6 +-
  Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fd
f
|   2 +-

Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf.inc
|   8 +-
  Platform/Intel/TigerlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   8 +-

Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/Include/Fdf/FlashMa
pInclude.fdf
|   4 +-

Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc
|   7 +-

Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.fdf
|  40 +--
  Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
b/PeiPolicyUpdateLib.inf
|   1 -

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDx
e.inf
|   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMa
pInclude.fdf
|   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/
PeiMultiBoardInitPreMemLib.inf
|   2 +-
  Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.
dsc
|   7 +-
  Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.
fdf
|  38 +--

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F
lashMapInclude.fdf
|   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.dsc
|   7 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.fdf
|  38 +--

Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCp
uPolicy

Lib.inf
|   4 +-

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Private/Library/PchSp
iComm

onLib.h
|  16 +-

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.i
nf
|   1 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCom
monLi

b/BasePchSpiCommonLib.inf
|  13 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf
|  51 ----
  Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
|   1 +
  Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
|   8 -
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceCom

mon.h                                                            |
0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceMm

.h                                                                |
0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceSm

m.inf                                                             |
6 +-
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceStan

daloneMm.inf                                                    |
6 +-
  Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
|  45 +++
  Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h
|   2 +-
  Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Ppi/Spi.h
|   4 +-
  Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h
|  39 +--
  Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
|  37 +++
  Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc
|  17 ++
  {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFl
ash CommonLib.inf                                                 |
24 +-
  {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlas
hComm

onLibNull.inf                                                |   3
+-

Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuP
olicyLi

b.inf
|   4 +-
  Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
|  12 +-

Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonL
ib.h
|  98 -------
  Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
|  26 --
  Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
| 293 -------------------

Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCo
mmonL

ib.h
|  20 +-

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
|   1 +

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf
|  53 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
BasePchSpiCommonLib.inf
|  11 +
  Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
|   1 +
  Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
|  13 +-
  Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec
|  11 -
  Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
|  98 -------
  Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
| 295 -------------------

Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib.
h
|  46 +--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf
|  50 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/BasePch
SpiCommonLib.inf
|  16 +-
  Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf
|   3 +-
  Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h
| 301 --------------------

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/IncludePrivate/Library
/SpiCom

monLib.h
|  16 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpi
Common

Lib/BaseSpiCommonLib.inf
|  19 +-
  Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf
|   1 +

Silicon/Intel/TigerlakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeTgl.inf
|   1 +
  Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec
|   8 -
  98 files changed, 1083 insertions(+), 2567 deletions(-)  delete
mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/
SpiF
lashCommon.c
  delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/
SpiF
lashCommonSmmLib.c
  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c
(100%)
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceCom

mon.c (96%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceMm

.c (94%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceStan

daloneMm.c (100%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceTrad

itionalMm.c (100%)  rename
Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Sp
i
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFla
shC ommonLib.c (90%)  rename {Platform/Intel/TigerlakeOpenBoardPkg
=>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlash
Com mon.c (93%)  rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlas
hComm

onLibNull.c (83%)  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sp
iFla
shCommon.c
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sp
iFla
shCommonSmmLib.c
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashCo
mm
on.c
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashCo
mm
onSmmLib.c
  delete mode 100644
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
  delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/
Sm
mSpiFlashCommonLib.inf
  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceCom

mon.h (100%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceMm

.h (100%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceSm

m.inf (88%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbSer
viceStan

daloneMm.inf (88%)  create mode 100644
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
  rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h (96%)  rename
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Ppi/Spi.h
(85%)  rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h (89%)  rename
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFl
ash CommonLib.inf (67%)  rename
{Platform/Intel/MinPlatformPkg/Flash
=>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlas
hComm

onLibNull.inf (91%)  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonL
ib.h
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
m
SpiFlashCommonLib.inf
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlas
hC
ommonLib.inf
  delete mode 100644
Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h

--
2.28.0.windows.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77097):
https://edk2.groups.io/g/devel/message/77097
Mute This Topic: https://groups.io/mt/83794775/1767664
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub
[nathaniel.l.desimone@...]
-=-=-=-=-=-=



Michael Kubacki
 

Hi Nate,

Does BoardMtOlympus in edk2-platforms/master build for you?

It looks like some additional microcode patches were added and the microcode FV was not expanded.

Generating MICROCODE_FV FV
Return Value = 2
GenFv: ERROR 3000: Invalid
the required fv image size 0x22460 exceeds the set fv image size
0x10000

- Michael

On 7/28/2021 8:08 PM, Michael Kubacki wrote:
Sure. These packages were added to edk2-platforms throughout the lifetime of this patch series.
Hopefully this is the last rebase...
Regards,
Michael
On 7/28/2021 7:58 PM, Desimone, Nathaniel L wrote:
Hi Michael,

The change content looks good. However, after applying your patch series PurleyOpenBoardPkg and WhitleyOpenBoardPkg no longer compile. Can you please fix these build errors?

For your reference, these are the tests that I ran:

build_bios.py -p BoardMtOlympus -t VS2015x86 -d
build_bios.py -p WilsonCityRvp -t VS2015x86 -d

Thanks,
Nate

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
Kubacki
Sent: Friday, June 25, 2021 2:21 PM
To: devel@edk2.groups.io
Cc: Agyeman, Prince <prince.agyeman@...>; Chiu, Chasel
<chasel.chiu@...>; Kethi Reddy, Deepika
<deepika.kethi.reddy@...>; Dong, Eric <eric.dong@...>; Luo,
Heng <heng.luo@...>; Jeremy Soller <jeremy@...>;
Esakkithevar, Kathappan <kathappan.esakkithevar@...>; Liming Gao
<gaoliming@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>; Chaganty, Rangasai V
<rangasai.v.chaganty@...>
Subject: [edk2-devel] [edk2-platforms][PATCH v4 00/41] Consolidate
SpiFlashCommonLib instances

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

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

SpiFlashCommonLib is duplicated in multiple places across the MinPlatform
design in edk2-platforms. I'm planning to build some additional functionality
on top of SpiFlashCommonLib and, ideally, this duplication will be
consolidated into a single instance usable across all current library consumers.

This patch series focuses on consolidating the various SpiFlashCommonLib
instances as agreed upon in https://edk2.groups.io/g/devel/message/71701.

Read the BZ for more general background around this series.

I only have an UpXtreme board on hand so maintainers/reviewers of other
board packages should test these changes on those boards.

V4 changes:
- Assigned new GUID values to the PCH SPI PPI and Protocols to
   differentiate from previous instances. This was done because
   the interface changed to identify SPI flash regions by GUID.

V3 changes:
- Added support to IntelSiliconPkg to identify flash regions by GUID as
   requested in v2 review feedback.
V2 changes:
- Rebased patch series on current edk2-platforms master (32183bdaa91)

Note: Previous patch series only received a couple review comments after
being on the mailing list for over 2 months. Please be respectful of
contributors time and efforts and review in a timely manner.

Cc: Agyeman Prince <prince.agyeman@...>
Cc: Chasel Chiu <chasel.chiu@...>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@...>
Cc: Eric Dong <eric.dong@...>
Cc: Heng Luo <heng.luo@...>
Cc: Jeremy Soller <jeremy@...>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@...>
Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...> Michael
Kubacki (41):
   CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
   WhiskeylakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
   CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to INF
   IntelSiliconPkg: Add BIOS area base address and size PCDs
   IntelSiliconPkg: Add microcode FV PCDs
   IntelSiliconPkg: Add PCH SPI PPI
   IntelSiliconPkg: Add PCH SPI Protocol
   IntelSiliconPkg: Add SpiFlashCommonLib
   IntelSiliconPkg: Add SmmSpiFlashCommonLib
   IntelSiliconPkg: Add MM SPI FVB services
   CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   KabylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   SimicsOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   TigerlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   CoffeelakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   KabylakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   SimicsIch10Pkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   TigerlakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
   CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   KabylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   SimicsOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   TigerlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   WhiskeylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
   MinPlatformPkg: Remove SpiFvbService modules
   CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib
   KabylakeSiliconPkg: Remove SmmSpiFlashCommonLib
   SimicsIch10Pkg: Remove SmmSpiFlashCommonLib
   TigerlakeOpenBoardPkg: Remove SmmSpiFlashCommonLib
   MinPlatformPkg: Remove SpiFlashCommonLibNull
   KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add IntelSiliconPkg.dec
   CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
   KabylakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
   SimicsIch10Pkg: Remove PCH SPI SMM Protocol from package
   TigerlakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
   IntelSiliconPkg: Add flash region GUIDs
   IntelSiliconPkg: Identify flash regions by GUID
   CoffeelakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
     GUID
   KabylakeSiliconPkg: Identify flash regions by GUID
   SimicsIch10Pkg/BasePchSpiCommonLib: Identify flash regions by GUID
   TigerlakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
     GUID


Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonLi
b/SpiCommon.c | 144 ++++++++--

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c | 196 -------------

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c |  54 ----
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c
|   0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.c                                                            | 4 +-
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.c                                                                | 8 +-
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.c                                                      |   0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceTrad
itionalMm.c                                                     |   0

Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Spi
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.c |   2 +-
  {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCom
mon.c                                                         |   7 +-
  {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.c                                                  |  12 +-

Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
c | 106 ++++++-

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c | 196 -------------

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c |  54 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
SpiCommon.c | 140 +++++++--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c | 194 -------------

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c |  54 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCom
mon.c | 165 ++++++++---
  Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c
|   4 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiCommon
Lib/SpiCommon.c | 176
++++++++++--
  Platform/Intel/CometlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/Fdf/Flash
MapInclude.fdf |   4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.d
sc |   7 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.f
df |  38 +--

Platform/Intel/CometlakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/
PeiPolicyUpdateLib.inf |   2 +-

Platform/Intel/CometlakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.i
nf |   4 +-
  Platform/Intel/KabylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   4 +-

Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapIn
clude.fdf |   4 +-
  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
|   7 +-
  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
|  40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa
pInclude.fdf |   4 +-
  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
|   7 +-
  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
|  40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilic
onPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf |
4 +-

Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiS
erialPortLibSpiFlash.inf |   1 +
  Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
|  98 -------
  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
|   2 -
  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
|   6 -
  Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
|   6 +-
  Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
|   2 +-
  Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf.inc
|   8 +-
  Platform/Intel/TigerlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   8 +-

Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/Include/Fdf/FlashMa
pInclude.fdf |   4 +-
  Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc
|   7 +-
  Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.fdf
|  40 +--
  Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
|   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
b/PeiPolicyUpdateLib.inf |   1 -

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDx
e.inf |   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMa
pInclude.fdf |   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/
PeiMultiBoardInitPreMemLib.inf |   2 +-
  Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
|   7 +-
  Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf
|  38 +--

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F
lashMapInclude.fdf |   4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.dsc |   7 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.fdf |  38 +--

Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
Lib.inf |   4 +-

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Private/Library/PchSpiComm
onLib.h |  16 +-
  Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
|   1 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonLi
b/BasePchSpiCommonLib.inf |  13 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf |  51 ----
  Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
|   1 +
  Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
|   8 -
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.h                                                            |   0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.h                                                                |   0
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceSm
m.inf                                                             | 6 +-
  {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.inf                                                    |   6 +-
  Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
|  45 +++
  Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h
|   2 +-
  Silicon/Intel/{CoffeelakeSiliconPkg/Pch => IntelSiliconPkg}/Include/Ppi/Spi.h
|   4 +-
  Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h
|  39 +--
  Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
|  37 +++
  Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc
|  17 ++
  {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlash
CommonLib.inf                                                 |  24 +-
  {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.inf                                                |   3 +-

Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
b.inf |   4 +-
  Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
|  12 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
|  98 -------
  Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
|  26 --
  Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
| 293 -------------------

Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonL
ib.h |  20 +-
  Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
|   1 +

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf |  53 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
BasePchSpiCommonLib.inf |  11 +
  Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
|   1 +
  Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
|  13 +-
  Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec
|  11 -
  Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
|  98 -------
  Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
| 295 -------------------
  Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib.h
|  46 +--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf |  50 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/BasePch
SpiCommonLib.inf |  16 +-
  Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf
|   3 +-
  Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h
| 301 --------------------

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/IncludePrivate/Library/SpiCom
monLib.h |  16 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiCommon
Lib/BaseSpiCommonLib.inf |  19 +-
  Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf
|   1 +
  Silicon/Intel/TigerlakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeTgl.inf
|   1 +
  Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec
|   8 -
  98 files changed, 1083 insertions(+), 2567 deletions(-)  delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c
  delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c
  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c (100%)
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.c (96%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.c (94%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.c (100%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceTrad
itionalMm.c (100%)  rename
Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Spi
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.c (90%)  rename {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCom
mon.c (93%)  rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.c (83%)  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c
  delete mode 100644
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
  delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf
  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.h (100%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.h (100%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceSm
m.inf (88%)  rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.inf (88%)  create mode 100644
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
  rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h (96%)  rename
Silicon/Intel/{CoffeelakeSiliconPkg/Pch => IntelSiliconPkg}/Include/Ppi/Spi.h
(85%)  rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h (89%)  rename
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlash
CommonLib.inf (67%)  rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.inf (91%)  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
  delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
  delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
  delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
  delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf
  delete mode 100644 Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h

--
2.28.0.windows.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77097): https://edk2.groups.io/g/devel/message/77097
Mute This Topic: https://groups.io/mt/83794775/1767664
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub
[nathaniel.l.desimone@...]
-=-=-=-=-=-=


Michael Kubacki
 

Sure. These packages were added to edk2-platforms throughout the lifetime of this patch series.

Hopefully this is the last rebase...

Regards,
Michael

On 7/28/2021 7:58 PM, Desimone, Nathaniel L wrote:
Hi Michael,
The change content looks good. However, after applying your patch series PurleyOpenBoardPkg and WhitleyOpenBoardPkg no longer compile. Can you please fix these build errors?
For your reference, these are the tests that I ran:
build_bios.py -p BoardMtOlympus -t VS2015x86 -d
build_bios.py -p WilsonCityRvp -t VS2015x86 -d
Thanks,
Nate

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
Kubacki
Sent: Friday, June 25, 2021 2:21 PM
To: devel@edk2.groups.io
Cc: Agyeman, Prince <prince.agyeman@...>; Chiu, Chasel
<chasel.chiu@...>; Kethi Reddy, Deepika
<deepika.kethi.reddy@...>; Dong, Eric <eric.dong@...>; Luo,
Heng <heng.luo@...>; Jeremy Soller <jeremy@...>;
Esakkithevar, Kathappan <kathappan.esakkithevar@...>; Liming Gao
<gaoliming@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>; Chaganty, Rangasai V
<rangasai.v.chaganty@...>
Subject: [edk2-devel] [edk2-platforms][PATCH v4 00/41] Consolidate
SpiFlashCommonLib instances

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

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

SpiFlashCommonLib is duplicated in multiple places across the MinPlatform
design in edk2-platforms. I'm planning to build some additional functionality
on top of SpiFlashCommonLib and, ideally, this duplication will be
consolidated into a single instance usable across all current library consumers.

This patch series focuses on consolidating the various SpiFlashCommonLib
instances as agreed upon in https://edk2.groups.io/g/devel/message/71701.

Read the BZ for more general background around this series.

I only have an UpXtreme board on hand so maintainers/reviewers of other
board packages should test these changes on those boards.

V4 changes:
- Assigned new GUID values to the PCH SPI PPI and Protocols to
differentiate from previous instances. This was done because
the interface changed to identify SPI flash regions by GUID.

V3 changes:
- Added support to IntelSiliconPkg to identify flash regions by GUID as
requested in v2 review feedback.
V2 changes:
- Rebased patch series on current edk2-platforms master (32183bdaa91)

Note: Previous patch series only received a couple review comments after
being on the mailing list for over 2 months. Please be respectful of
contributors time and efforts and review in a timely manner.

Cc: Agyeman Prince <prince.agyeman@...>
Cc: Chasel Chiu <chasel.chiu@...>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@...>
Cc: Eric Dong <eric.dong@...>
Cc: Heng Luo <heng.luo@...>
Cc: Jeremy Soller <jeremy@...>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@...>
Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...> Michael
Kubacki (41):
CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
WhiskeylakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to INF
IntelSiliconPkg: Add BIOS area base address and size PCDs
IntelSiliconPkg: Add microcode FV PCDs
IntelSiliconPkg: Add PCH SPI PPI
IntelSiliconPkg: Add PCH SPI Protocol
IntelSiliconPkg: Add SpiFlashCommonLib
IntelSiliconPkg: Add SmmSpiFlashCommonLib
IntelSiliconPkg: Add MM SPI FVB services
CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
KabylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
SimicsOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
TigerlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
CoffeelakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
KabylakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
SimicsIch10Pkg: Use IntelSiliconPkg BIOS area and ucode PCDs
TigerlakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
KabylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
SimicsOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
TigerlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
WhiskeylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
MinPlatformPkg: Remove SpiFvbService modules
CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib
KabylakeSiliconPkg: Remove SmmSpiFlashCommonLib
SimicsIch10Pkg: Remove SmmSpiFlashCommonLib
TigerlakeOpenBoardPkg: Remove SmmSpiFlashCommonLib
MinPlatformPkg: Remove SpiFlashCommonLibNull
KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add IntelSiliconPkg.dec
CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
KabylakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
SimicsIch10Pkg: Remove PCH SPI SMM Protocol from package
TigerlakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
IntelSiliconPkg: Add flash region GUIDs
IntelSiliconPkg: Identify flash regions by GUID
CoffeelakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
GUID
KabylakeSiliconPkg: Identify flash regions by GUID
SimicsIch10Pkg/BasePchSpiCommonLib: Identify flash regions by GUID
TigerlakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
GUID


Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonLi
b/SpiCommon.c | 144 ++++++++--

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c | 196 -------------

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c | 54 ----
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c
| 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.c | 4 +-
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.c | 8 +-
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.c | 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceTrad
itionalMm.c | 0

Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Spi
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.c | 2 +-
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCom
mon.c | 7 +-
{Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.c | 12 +-

Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
c | 106 ++++++-

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c | 196 -------------

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c | 54 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
SpiCommon.c | 140 +++++++--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c | 194 -------------

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c | 54 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCom
mon.c | 165 ++++++++---
Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c
| 4 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiCommon
Lib/SpiCommon.c | 176
++++++++++--
Platform/Intel/CometlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/Fdf/Flash
MapInclude.fdf | 4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.d
sc | 7 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.f
df | 38 +--

Platform/Intel/CometlakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/
PeiPolicyUpdateLib.inf | 2 +-

Platform/Intel/CometlakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.i
nf | 4 +-
Platform/Intel/KabylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 4 +-

Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapIn
clude.fdf | 4 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
| 40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa
pInclude.fdf | 4 +-
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
| 40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilic
onPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf |
4 +-

Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiS
erialPortLibSpiFlash.inf | 1 +
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
| 98 -------
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
| 2 -
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
| 6 -
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
| 6 +-
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
| 2 +-
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf.inc
| 8 +-
Platform/Intel/TigerlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 8 +-

Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/Include/Fdf/FlashMa
pInclude.fdf | 4 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.fdf
| 40 +--
Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
b/PeiPolicyUpdateLib.inf | 1 -

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDx
e.inf | 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMa
pInclude.fdf | 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/
PeiMultiBoardInitPreMemLib.inf | 2 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf
| 38 +--

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F
lashMapInclude.fdf | 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.dsc | 7 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.fdf | 38 +--

Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
Lib.inf | 4 +-

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Private/Library/PchSpiComm
onLib.h | 16 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
| 1 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonLi
b/BasePchSpiCommonLib.inf | 13 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf | 51 ----
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
| 1 +
Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
| 8 -
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.h | 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.h | 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceSm
m.inf | 6 +-
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.inf | 6 +-
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
| 45 +++
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h
| 2 +-
Silicon/Intel/{CoffeelakeSiliconPkg/Pch => IntelSiliconPkg}/Include/Ppi/Spi.h
| 4 +-
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h
| 39 +--
Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
| 37 +++
Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc
| 17 ++
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlash
CommonLib.inf | 24 +-
{Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.inf | 3 +-

Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
b.inf | 4 +-
Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
| 12 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
| 98 -------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
| 26 --
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
| 293 -------------------

Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonL
ib.h | 20 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
| 1 +

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf | 53 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
BasePchSpiCommonLib.inf | 11 +
Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
| 1 +
Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
| 13 +-
Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec
| 11 -
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
| 98 -------
Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
| 295 -------------------
Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib.h
| 46 +--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf | 50 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/BasePch
SpiCommonLib.inf | 16 +-
Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf
| 3 +-
Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h
| 301 --------------------

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/IncludePrivate/Library/SpiCom
monLib.h | 16 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiCommon
Lib/BaseSpiCommonLib.inf | 19 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf
| 1 +
Silicon/Intel/TigerlakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeTgl.inf
| 1 +
Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec
| 8 -
98 files changed, 1083 insertions(+), 2567 deletions(-) delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c
delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c (100%)
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.c (96%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.c (94%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.c (100%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceTrad
itionalMm.c (100%) rename
Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Spi
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.c (90%) rename {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCom
mon.c (93%) rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.c (83%) delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c
delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c
delete mode 100644
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.h (100%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.h (100%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceSm
m.inf (88%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.inf (88%) create mode 100644
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h (96%) rename
Silicon/Intel/{CoffeelakeSiliconPkg/Pch => IntelSiliconPkg}/Include/Ppi/Spi.h
(85%) rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h (89%) rename
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlash
CommonLib.inf (67%) rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.inf (91%) delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf
delete mode 100644 Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h

--
2.28.0.windows.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77097): https://edk2.groups.io/g/devel/message/77097
Mute This Topic: https://groups.io/mt/83794775/1767664
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub
[nathaniel.l.desimone@...]
-=-=-=-=-=-=


Nate DeSimone
 

Hi Michael,

The change content looks good. However, after applying your patch series PurleyOpenBoardPkg and WhitleyOpenBoardPkg no longer compile. Can you please fix these build errors?

For your reference, these are the tests that I ran:

build_bios.py -p BoardMtOlympus -t VS2015x86 -d
build_bios.py -p WilsonCityRvp -t VS2015x86 -d

Thanks,
Nate

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
Kubacki
Sent: Friday, June 25, 2021 2:21 PM
To: devel@edk2.groups.io
Cc: Agyeman, Prince <prince.agyeman@...>; Chiu, Chasel
<chasel.chiu@...>; Kethi Reddy, Deepika
<deepika.kethi.reddy@...>; Dong, Eric <eric.dong@...>; Luo,
Heng <heng.luo@...>; Jeremy Soller <jeremy@...>;
Esakkithevar, Kathappan <kathappan.esakkithevar@...>; Liming Gao
<gaoliming@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>; Chaganty, Rangasai V
<rangasai.v.chaganty@...>
Subject: [edk2-devel] [edk2-platforms][PATCH v4 00/41] Consolidate
SpiFlashCommonLib instances

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

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

SpiFlashCommonLib is duplicated in multiple places across the MinPlatform
design in edk2-platforms. I'm planning to build some additional functionality
on top of SpiFlashCommonLib and, ideally, this duplication will be
consolidated into a single instance usable across all current library consumers.

This patch series focuses on consolidating the various SpiFlashCommonLib
instances as agreed upon in https://edk2.groups.io/g/devel/message/71701.

Read the BZ for more general background around this series.

I only have an UpXtreme board on hand so maintainers/reviewers of other
board packages should test these changes on those boards.

V4 changes:
- Assigned new GUID values to the PCH SPI PPI and Protocols to
differentiate from previous instances. This was done because
the interface changed to identify SPI flash regions by GUID.

V3 changes:
- Added support to IntelSiliconPkg to identify flash regions by GUID as
requested in v2 review feedback.
V2 changes:
- Rebased patch series on current edk2-platforms master (32183bdaa91)

Note: Previous patch series only received a couple review comments after
being on the mailing list for over 2 months. Please be respectful of
contributors time and efforts and review in a timely manner.

Cc: Agyeman Prince <prince.agyeman@...>
Cc: Chasel Chiu <chasel.chiu@...>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@...>
Cc: Eric Dong <eric.dong@...>
Cc: Heng Luo <heng.luo@...>
Cc: Jeremy Soller <jeremy@...>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@...>
Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...> Michael
Kubacki (41):
CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
WhiskeylakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to INF
IntelSiliconPkg: Add BIOS area base address and size PCDs
IntelSiliconPkg: Add microcode FV PCDs
IntelSiliconPkg: Add PCH SPI PPI
IntelSiliconPkg: Add PCH SPI Protocol
IntelSiliconPkg: Add SpiFlashCommonLib
IntelSiliconPkg: Add SmmSpiFlashCommonLib
IntelSiliconPkg: Add MM SPI FVB services
CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
KabylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
SimicsOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
TigerlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
CoffeelakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
KabylakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
SimicsIch10Pkg: Use IntelSiliconPkg BIOS area and ucode PCDs
TigerlakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
KabylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
SimicsOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
TigerlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
WhiskeylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
MinPlatformPkg: Remove SpiFvbService modules
CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib
KabylakeSiliconPkg: Remove SmmSpiFlashCommonLib
SimicsIch10Pkg: Remove SmmSpiFlashCommonLib
TigerlakeOpenBoardPkg: Remove SmmSpiFlashCommonLib
MinPlatformPkg: Remove SpiFlashCommonLibNull
KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add IntelSiliconPkg.dec
CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
KabylakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
SimicsIch10Pkg: Remove PCH SPI SMM Protocol from package
TigerlakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
IntelSiliconPkg: Add flash region GUIDs
IntelSiliconPkg: Identify flash regions by GUID
CoffeelakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
GUID
KabylakeSiliconPkg: Identify flash regions by GUID
SimicsIch10Pkg/BasePchSpiCommonLib: Identify flash regions by GUID
TigerlakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
GUID


Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonLi
b/SpiCommon.c | 144 ++++++++--

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c | 196 -------------

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c | 54 ----
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c
| 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.c | 4 +-
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.c | 8 +-
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.c | 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceTrad
itionalMm.c | 0

Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Spi
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.c | 2 +-
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCom
mon.c | 7 +-
{Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.c | 12 +-

Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
c | 106 ++++++-

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c | 196 -------------

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c | 54 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
SpiCommon.c | 140 +++++++--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c | 194 -------------

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c | 54 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCom
mon.c | 165 ++++++++---
Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c
| 4 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiCommon
Lib/SpiCommon.c | 176
++++++++++--
Platform/Intel/CometlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/Fdf/Flash
MapInclude.fdf | 4 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.d
sc | 7 +-

Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.f
df | 38 +--

Platform/Intel/CometlakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/
PeiPolicyUpdateLib.inf | 2 +-

Platform/Intel/CometlakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.i
nf | 4 +-
Platform/Intel/KabylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 4 +-

Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapIn
clude.fdf | 4 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
| 40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa
pInclude.fdf | 4 +-
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
| 40 +--

Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilic
onPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf |
4 +-

Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiS
erialPortLibSpiFlash.inf | 1 +
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
| 98 -------
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
| 2 -
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
| 6 -
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
| 6 +-
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
| 2 +-
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf.inc
| 8 +-
Platform/Intel/TigerlakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 8 +-

Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/Include/Fdf/FlashMa
pInclude.fdf | 4 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.fdf
| 40 +--
Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf
| 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
b/PeiPolicyUpdateLib.inf | 1 -

Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDx
e.inf | 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMa
pInclude.fdf | 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/
PeiMultiBoardInitPreMemLib.inf | 2 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
| 7 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf
| 38 +--

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F
lashMapInclude.fdf | 4 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.dsc | 7 +-

Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk
g.fdf | 38 +--

Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
Lib.inf | 4 +-

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Private/Library/PchSpiComm
onLib.h | 16 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
| 1 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonLi
b/BasePchSpiCommonLib.inf | 13 +

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf | 51 ----
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
| 1 +
Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
| 8 -
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.h | 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.h | 0
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceSm
m.inf | 6 +-
{Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.inf | 6 +-
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
| 45 +++
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h
| 2 +-
Silicon/Intel/{CoffeelakeSiliconPkg/Pch => IntelSiliconPkg}/Include/Ppi/Spi.h
| 4 +-
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h
| 39 +--
Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
| 37 +++
Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc
| 17 ++
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlash
CommonLib.inf | 24 +-
{Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.inf | 3 +-

Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
b.inf | 4 +-
Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
| 12 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
| 98 -------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
| 26 --
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
| 293 -------------------

Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonL
ib.h | 20 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
| 1 +

Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf | 53 ----

Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
BasePchSpiCommonLib.inf | 11 +
Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
| 1 +
Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
| 13 +-
Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec
| 11 -
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
| 98 -------
Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
| 295 -------------------
Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib.h
| 46 +--

Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf | 50 ----

Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/BasePch
SpiCommonLib.inf | 16 +-
Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf
| 3 +-
Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h
| 301 --------------------

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/IncludePrivate/Library/SpiCom
monLib.h | 16 +-

Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiCommon
Lib/BaseSpiCommonLib.inf | 19 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf
| 1 +
Silicon/Intel/TigerlakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeTgl.inf
| 1 +
Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec
| 8 -
98 files changed, 1083 insertions(+), 2567 deletions(-) delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommon.c
delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
lashCommonSmmLib.c
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/FvbInfo.c (100%)
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.c (96%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.c (94%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.c (100%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceTrad
itionalMm.c (100%) rename
Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/Spi
FlashCommonSmmLib.c =>
Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.c (90%) rename {Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCom
mon.c (93%) rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.c (83%) delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommon.c
delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla
shCommonSmmLib.c
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
on.c
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashComm
onSmmLib.c
delete mode 100644
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
delete mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
mSpiFlashCommonLib.inf
rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceCom
mon.h (100%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceMm
.h (100%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceSm
m.inf (88%) rename {Platform/Intel/MinPlatformPkg =>
Silicon/Intel/IntelSiliconPkg/Feature}/Flash/SpiFvbService/SpiFvbServiceStan
daloneMm.inf (88%) create mode 100644
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h
rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Library/SpiFlashCommonLib.h (96%) rename
Silicon/Intel/{CoffeelakeSiliconPkg/Pch => IntelSiliconPkg}/Include/Ppi/Spi.h
(85%) rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =>
IntelSiliconPkg}/Include/Protocol/Spi.h (89%) rename
{Platform/Intel/TigerlakeOpenBoardPkg =>
Silicon/Intel/IntelSiliconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlash
CommonLib.inf (67%) rename {Platform/Intel/MinPlatformPkg/Flash =>
Silicon/Intel/IntelSiliconPkg}/Library/SpiFlashCommonLibNull/SpiFlashComm
onLibNull.inf (91%) delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
delete mode 100644
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
SpiFlashCommonLib.inf
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
delete mode 100644
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashC
ommonLib.inf
delete mode 100644 Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h

--
2.28.0.windows.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77097): https://edk2.groups.io/g/devel/message/77097
Mute This Topic: https://groups.io/mt/83794775/1767664
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub
[nathaniel.l.desimone@...]
-=-=-=-=-=-=


Michael Kubacki
 

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

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

SpiFlashCommonLib is duplicated in multiple places across the MinPlatform
design in edk2-platforms. I'm planning to build some additional
functionality on top of SpiFlashCommonLib and, ideally, this duplication
will be consolidated into a single instance usable across all current lib=
rary
consumers.

This patch series focuses on consolidating the various SpiFlashCommonLib
instances as agreed upon in https://edk2.groups.io/g/devel/message/71701.

Read the BZ for more general background around this series.

I only have an UpXtreme board on hand so maintainers/reviewers of other
board packages should test these changes on those boards.

V4 changes:
- Assigned new GUID values to the PCH SPI PPI and Protocols to
differentiate from previous instances. This was done because
the interface changed to identify SPI flash regions by GUID.

V3 changes:
- Added support to IntelSiliconPkg to identify flash regions by GUID as
requested in v2 review feedback.
V2 changes:
- Rebased patch series on current edk2-platforms master (32183bdaa91)

Note: Previous patch series only received a couple review comments after
being on the mailing list for over 2 months. Please be respectful of
contributors time and efforts and review in a timely manner.

Cc: Agyeman Prince <prince.agyeman@...>
Cc: Chasel Chiu <chasel.chiu@...>
Cc: Deepika Kethi Reddy <deepika.kethi.reddy@...>
Cc: Eric Dong <eric.dong@...>
Cc: Heng Luo <heng.luo@...>
Cc: Jeremy Soller <jeremy@...>
Cc: Kathappan Esakkithevar <kathappan.esakkithevar@...>
Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
Michael Kubacki (41):
CometlakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
WhiskeylakeOpenBoardPkg: Remove redundant IntelSiliconPkg.dec entry
CometlakeOpenBoardPkg/PeiPolicyUpdateLib: Add missing GUID to INF
IntelSiliconPkg: Add BIOS area base address and size PCDs
IntelSiliconPkg: Add microcode FV PCDs
IntelSiliconPkg: Add PCH SPI PPI
IntelSiliconPkg: Add PCH SPI Protocol
IntelSiliconPkg: Add SpiFlashCommonLib
IntelSiliconPkg: Add SmmSpiFlashCommonLib
IntelSiliconPkg: Add MM SPI FVB services
CometlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
KabylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
SimicsOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
TigerlakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
CoffeelakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
KabylakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
SimicsIch10Pkg: Use IntelSiliconPkg BIOS area and ucode PCDs
TigerlakeSiliconPkg: Use IntelSiliconPkg BIOS area and ucode PCDs
CometlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
KabylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
SimicsOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
TigerlakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
WhiskeylakeOpenBoardPkg: Update SpiFvbService & SpiFlashCommonLib
MinPlatformPkg: Remove SpiFvbService modules
CoffeelakeSiliconPkg: Remove SmmSpiFlashCommonLib
KabylakeSiliconPkg: Remove SmmSpiFlashCommonLib
SimicsIch10Pkg: Remove SmmSpiFlashCommonLib
TigerlakeOpenBoardPkg: Remove SmmSpiFlashCommonLib
MinPlatformPkg: Remove SpiFlashCommonLibNull
KabylakeOpenBoardPkg/PeiSerialPortLibSpiFlash: Add IntelSiliconPkg.dec
CoffeelakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
KabylakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
SimicsIch10Pkg: Remove PCH SPI SMM Protocol from package
TigerlakeSiliconPkg: Remove PCH SPI PPI and Protocol from package
IntelSiliconPkg: Add flash region GUIDs
IntelSiliconPkg: Identify flash regions by GUID
CoffeelakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
GUID
KabylakeSiliconPkg: Identify flash regions by GUID
SimicsIch10Pkg/BasePchSpiCommonLib: Identify flash regions by GUID
TigerlakeSiliconPkg/BasePchSpiCommonLib: Identify flash regions by
GUID

Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonL=
ib/SpiCommon.c =
| 144 ++++++++--
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF=
lashCommon.c =
| 196 -------------
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF=
lashCommonSmmLib.c =
| 54 ----
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/FvbInfo.c =
| 0
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceCommon.c =
| 4 +-
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceMm.c =
| 8 +-
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.c =
| 0
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceTraditionalMm.c =
| 0
Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFla=
shCommonSmmLib.c =3D> Silicon/Intel/IntelSiliconPkg/Library/SmmSpiFlashCo=
mmonLib/SmmSpiFlashCommonLib.c | 2 +-
{Platform/Intel/TigerlakeOpenBoardPkg =3D> Silicon/Intel/IntelSiliconPkg=
}/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c =
| 7 +-
{Platform/Intel/MinPlatformPkg/Flash =3D> Silicon/Intel/IntelSiliconPkg}=
/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.c =
| 12 +-
Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c=
=
| 106 ++++++-
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla=
shCommon.c =
| 196 -------------
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFla=
shCommonSmmLib.c =
| 54 ----
Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/=
SpiCommon.c =
| 140 +++++++--
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon=
.c =
| 194 -------------
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon=
SmmLib.c =
| 54 ----
Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCommo=
n.c =
| 165 ++++++++---
Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c =
=
| 4 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiComm=
onLib/SpiCommon.c =
| 176 ++++++++++--
Platform/Intel/CometlakeOpenBoardPkg/BiosInfo/BiosInfo.inf =
=
| 4 +-
Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/Fdf/FlashMapI=
nclude.fdf =
| 4 +-
Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc =
=
| 7 +-
Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.fdf =
=
| 38 +--
Platform/Intel/CometlakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/P=
eiPolicyUpdateLib.inf =
| 2 +-
Platform/Intel/CometlakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.=
inf =
| 4 +-
Platform/Intel/KabylakeOpenBoardPkg/BiosInfo/BiosInfo.inf =
=
| 4 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapInclu=
de.fdf =
| 4 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc =
=
| 7 +-
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf =
=
| 40 +--
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMapInc=
lude.fdf =
| 4 +-
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc =
=
| 7 +-
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf =
=
| 40 +--
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilic=
onPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf =
| 4 +-
Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/Pei=
SerialPortLibSpiFlash.inf =
| 1 +
Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h =
=
| 98 -------
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec =
=
| 2 -
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc =
=
| 6 -
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc =
=
| 6 +-
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf =
=
| 2 +-
Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf.inc =
=
| 8 +-
Platform/Intel/TigerlakeOpenBoardPkg/BiosInfo/BiosInfo.inf =
=
| 8 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/Include/Fdf/FlashMapI=
nclude.fdf =
| 4 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc =
=
| 7 +-
Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.fdf =
=
| 40 +--
Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf =
=
| 4 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib=
/PeiPolicyUpdateLib.inf =
| 1 -
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDx=
e.inf =
| 4 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMapIncl=
ude.fdf =
| 4 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/Pei=
MultiBoardInitPreMemLib.inf =
| 2 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc =
=
| 7 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf =
=
| 38 +--
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Flash=
MapInclude.fdf =
| 4 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc =
=
| 7 +-
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf =
=
| 38 +--
Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPol=
icyLib.inf =
| 4 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Private/Library/PchSpiCom=
monLib.h =
| 16 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf =
=
| 1 +
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/BasePchSpiCommonL=
ib/BasePchSpiCommonLib.inf =
| 13 +
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmS=
piFlashCommonLib.inf =
| 51 ----
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf =
=
| 1 +
Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec =
=
| 8 -
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceCommon.h =
| 0
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceMm.h =
| 0
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceSmm.inf =
| 6 +-
{Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg/Featur=
e}/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf =
| 6 +-
Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegion.h =
=
| 45 +++
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =3D> IntelSiliconPkg}/Include/Li=
brary/SpiFlashCommonLib.h =
| 2 +-
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =3D> IntelSiliconPkg}/Include/Pp=
i/Spi.h =
| 4 +-
Silicon/Intel/{CoffeelakeSiliconPkg/Pch =3D> IntelSiliconPkg}/Include/Pr=
otocol/Spi.h =
| 39 +--
Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec =
=
| 37 +++
Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc =
=
| 17 ++
{Platform/Intel/TigerlakeOpenBoardPkg =3D> Silicon/Intel/IntelSiliconPkg=
}/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf =
| 24 +-
{Platform/Intel/MinPlatformPkg/Flash =3D> Silicon/Intel/IntelSiliconPkg}=
/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf =
| 3 +-
Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolic=
yLib.inf =
| 4 +-
Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf =
=
| 12 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h=
=
| 98 -------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h =
=
| 26 --
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h =
=
| 293 -------------------
Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommon=
Lib.h =
| 20 +-
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf =
=
| 1 +
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpi=
FlashCommonLib.inf =
| 53 ----
Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/=
BasePchSpiCommonLib.inf =
| 11 +
Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf =
=
| 1 +
Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec =
=
| 13 +-
Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec =
=
| 11 -
Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlashCommonLib.h =
=
| 98 -------
Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h =
=
| 295 -------------------
Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib.h =
=
| 46 +--
Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCom=
monLib.inf =
| 50 ----
Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/BasePchS=
piCommonLib.inf =
| 16 +-
Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf =
=
| 3 +-
Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Spi.h =
=
| 301 --------------------
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/IncludePrivate/Library/Spi=
CommonLib.h =
| 16 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/LibraryPrivate/BaseSpiComm=
onLib/BaseSpiCommonLib.inf =
| 19 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf =
=
| 1 +
Silicon/Intel/TigerlakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeTgl.inf =
=
| 1 +
Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec =
=
| 8 -
98 files changed, 1083 insertions(+), 2567 deletions(-)
delete mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpi=
FlashCommonLib/SpiFlashCommon.c
delete mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpi=
FlashCommonLib/SpiFlashCommonSmmLib.c
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/FvbInfo.c (100%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceCommon.c (96%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceMm.c (94%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.c (100%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceTraditionalMm.c (100%)
rename Platform/Intel/TigerlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib=
/SpiFlashCommonSmmLib.c =3D> Silicon/Intel/IntelSiliconPkg/Library/SmmSpi=
FlashCommonLib/SmmSpiFlashCommonLib.c (90%)
rename {Platform/Intel/TigerlakeOpenBoardPkg =3D> Silicon/Intel/IntelSil=
iconPkg}/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c (93%)
rename {Platform/Intel/MinPlatformPkg/Flash =3D> Silicon/Intel/IntelSili=
conPkg}/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.c (83%)
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFl=
ashCommonLib/SpiFlashCommon.c
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFl=
ashCommonLib/SpiFlashCommonSmmLib.c
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommo=
nLib/SpiFlashCommon.c
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommo=
nLib/SpiFlashCommonSmmLib.c
delete mode 100644 Platform/Intel/MinPlatformPkg/Include/Library/SpiFlas=
hCommonLib.h
delete mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/SmmSpi=
FlashCommonLib/SmmSpiFlashCommonLib.inf
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceCommon.h (100%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceMm.h (100%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceSmm.inf (88%)
rename {Platform/Intel/MinPlatformPkg =3D> Silicon/Intel/IntelSiliconPkg=
/Feature}/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf (88%)
create mode 100644 Silicon/Intel/IntelSiliconPkg/Include/Guid/FlashRegio=
n.h
rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =3D> IntelSiliconPkg}/Inc=
lude/Library/SpiFlashCommonLib.h (96%)
rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =3D> IntelSiliconPkg}/Inc=
lude/Ppi/Spi.h (85%)
rename Silicon/Intel/{CoffeelakeSiliconPkg/Pch =3D> IntelSiliconPkg}/Inc=
lude/Protocol/Spi.h (89%)
rename {Platform/Intel/TigerlakeOpenBoardPkg =3D> Silicon/Intel/IntelSil=
iconPkg}/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf (67%)
rename {Platform/Intel/MinPlatformPkg/Flash =3D> Silicon/Intel/IntelSili=
conPkg}/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf (91%)
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/=
SpiFlashCommonLib.h
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.=
h
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol=
/Spi.h
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFl=
ashCommonLib/SmmSpiFlashCommonLib.inf
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Include/Library/SpiFlash=
CommonLib.h
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h
delete mode 100644 Silicon/Intel/SimicsIch10Pkg/Library/SmmSpiFlashCommo=
nLib/SmmSpiFlashCommonLib.inf
delete mode 100644 Silicon/Intel/TigerlakeSiliconPkg/Include/Protocol/Sp=
i.h

--=20
2.28.0.windows.1