Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: mikub...@linux.microsoft.com <mikub...@linux.microsoft.com> > Sent: Saturday, June 26, 2021 5:21 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Jeremy Soller <jer...@system76.com> > Subject: [edk2-platforms][PATCH v4 21/41] KabylakeOpenBoardPkg: Update > SpiFvbService & SpiFlashCommonLib > > From: Michael Kubacki <michael.kuba...@microsoft.com> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3307 > > Updates KabylakeOpenBoardPkg to use the SmmSpiFlashCommonLib instance in > IntelSiliconPkg and the SpiFvbServiceSmm driver in IntelSiliconPkg. > > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Jeremy Soller <jer...@system76.com> > Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com> > Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > Reviewed-by: Chasel Chiu <chasel.c...@intel.com> > --- > Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc | 7 > +++++-- > Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf | 2 +- > Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 7 > +++++-- > Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 2 +- > 4 files changed, 12 insertions(+), 6 deletions(-) > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > index 302cb679b5eb..89be744a9038 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > @@ -228,7 +228,7 @@ [LibraryClasses.X64.DXE_SMM_DRIVER] > ####################################### > # Silicon Initialization Package > ####################################### > - > SpiFlashCommonLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/SmmSpiFlashCom > monLib/SmmSpiFlashCommonLib.inf > + > + > SpiFlashCommonLib|IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiF > + lashCommonLib.inf > > ####################################### > # Platform Package > @@ -377,6 +377,10 @@ [Components.X64] > IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf > $(PLATFORM_SI_BIN_PACKAGE)/Microcode/MicrocodeUpdates.inf > > +!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE > + IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf > +!endif > + > ####################################### > # Platform Package > ####################################### > @@ -393,7 +397,6 @@ [Components.X64] > > !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE > > - $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf > $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf > > $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf { diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf > index 39432d21b8b5..239b6b720a6a 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf > +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf > @@ -401,7 +401,7 @@ [FV.FvOsBootUncompact] !if > gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE INF > $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf > INF > $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf > -INF $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf > +INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf > > INF $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf > INF $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > index 8523ab3f4fc1..f29393579c06 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > @@ -268,7 +268,7 @@ [LibraryClasses.X64.DXE_SMM_DRIVER] > ####################################### > # Silicon Initialization Package > ####################################### > - > SpiFlashCommonLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/SmmSpiFlashCom > monLib/SmmSpiFlashCommonLib.inf > + > + > SpiFlashCommonLib|IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiF > + lashCommonLib.inf > > ####################################### > # Platform Package > @@ -456,6 +456,10 @@ [Components.X64] > IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf > $(PLATFORM_SI_BIN_PACKAGE)/Microcode/MicrocodeUpdates.inf > > +!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE > + IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf > +!endif > + > ####################################### > # Platform Package > ####################################### > @@ -472,7 +476,6 @@ [Components.X64] > > !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE > > - $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf > $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf > > $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf { diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > index f003dda0ddfc..23f9be5cf2a2 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > @@ -408,7 +408,7 @@ [FV.FvOsBootUncompact] !if > gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE INF > $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf > INF > $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf > -INF $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf > +INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf > > INF $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf > INF $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf > -- > 2.28.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#77142): https://edk2.groups.io/g/devel/message/77142 Mute This Topic: https://groups.io/mt/83794805/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
