Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kubacki, Michael A Sent: Wednesday, November 27, 2019 5:06 PM To: devel@edk2.groups.io Cc: Wei, David Y <david.y....@intel.com>; Agyeman, Prince <prince.agye...@intel.com> Subject: [edk2-devel] [edk2-platforms][PATCH V2 38/47] SimicsOpenBoardPkg: Use new advanced feature refactor
Updates advanced feature references in SimicsOpenBoardPkg to the new advanced feature packages in Features/Intel. Previously, the advanced features in Platform/Intel were used. SimicsOpenBoardPkg currently uses the SMBIOS and Network advanced features. These are the same features used by the package prior to the advanced feature refactor. Note that SimicsOpenBoardPkg depends upon these advanced features even when the boot stage is less than the advanced feature stage. This bug was not fixed in this commit and is filed to be resolved in the following Bugzilla item: https://bugzilla.tianocore.org/show_bug.cgi?id=2165 Cc: Wei David Y <david.y....@intel.com> Cc: Agyeman Prince <prince.agye...@intel.com> Signed-off-by: Michael Kubacki <michael.a.kuba...@intel.com> --- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 11 ++--------- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc | 12 ++++++------ Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 10 ++-------- Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 1 - 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 2f287a4ca4..7576648d57 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -42,8 +42,9 @@ DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE + !include + AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.d + sc !include $(PROJECT)/OpenBoardPkgPcd.dsc - !include NetworkPkg/NetworkDefines.dsc.inc + !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc ################################################################################ # @@ -80,7 +81,6 @@ # is completed [Components.X64] !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc -!include AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc ####################################### # Build Option Includes @@ -285,13 +285,6 @@ $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf !endif - ####################################### - # Advanced Feature Package - ####################################### -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE - AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf -!endif - ####################################### # Board Package ####################################### diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc index cd95755f91..cd98d09f01 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.ds +++ c @@ -96,8 +96,8 @@ ###################################### # Advanced Feature Configuration ###################################### - gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable|TRUE - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable|TRUE + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable|TRUE + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable|TRUE [PcdsFeatureFlag.X64] ###################################### @@ -252,10 +252,10 @@ ###################################### # Advanced Feature Configuration ###################################### - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosReleaseDate|"2019-08-09" - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosVersion|"Ver.1.0.0" - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType1StringProductName|"QSP UEFI BIOS" - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType2StringProductName|"QSP UEFI BIOS" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosReleaseDate|"2019-08-09" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosVersion|"Ver.1.0.0" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType1StringProductName|"QSP UEFI BIOS" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType2StringProductName|"QSP UEFI BIOS" [PcdsDynamicExDefault] ###################################### diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf index ef6b35c92f..e0a1daddee 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf @@ -155,7 +155,7 @@ INF MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf INF MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf INF MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf !include MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf -!include AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf +!include AdvancedFeaturePkg/Include/PreMemory.fdf INF $(BOARD_PKG)/SimicsPei/SimicsPei.inf !include $(SKT_PKG)/SktPostMemoryInclude.fdf !include $(PCH_PKG)/IchPostMemoryInclude.fdf @@ -163,7 +163,6 @@ INF $(BOARD_PKG)/SimicsPei/SimicsPei.inf INF MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf INF MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf !include MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclude.fdf -!include AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf INF $(SKT_PKG)/Smm/Access/SmmAccessPei.inf @@ -199,6 +198,7 @@ INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf !include MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf +!include AdvancedFeaturePkg/Include/PostMemory.fdf INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -238,12 +238,6 @@ INF ShellPkg/Application/Shell/Shell.inf # INF SimicsIch10BinPkg/UndiBinary/UndiDxe.inf -!include AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf - -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE - INF AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf -!endif - !include MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf [FV.FVMAIN_COMPACT] diff --git a/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 3cc6a03564..f8ecab08e6 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatform +++ Dxe.inf @@ -31,7 +31,6 @@ MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec SimicsOpenBoardPkg/OpenBoardPkg.dec - AdvancedFeaturePkg/AdvancedFeaturePkg.dec BoardModulePkg/BoardModulePkg.dec [LibraryClasses] -- 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51686): https://edk2.groups.io/g/devel/message/51686 Mute This Topic: https://groups.io/mt/63460387/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
