From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.459.1575417470042257311 for ; Tue, 03 Dec 2019 15:57:50 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 15:57:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,275,1571727600"; d="scan'208";a="361372302" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by orsmga004.jf.intel.com with ESMTP; 03 Dec 2019 15:57:49 -0800 Received: from orsmsx112.amr.corp.intel.com (10.22.240.13) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 3 Dec 2019 15:57:49 -0800 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.67]) by ORSMSX112.amr.corp.intel.com ([169.254.3.26]) with mapi id 14.03.0439.000; Tue, 3 Dec 2019 15:57:48 -0800 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Kubacki, Michael A" CC: "Wei, David Y" , "Agyeman, Prince" Subject: Re: [edk2-devel] [edk2-platforms][PATCH V2 38/47] SimicsOpenBoardPkg: Use new advanced feature refactor Thread-Topic: [edk2-devel] [edk2-platforms][PATCH V2 38/47] SimicsOpenBoardPkg: Use new advanced feature refactor Thread-Index: AQHVpYhnesPKU0fc5ky9IKOfIlhQyqepH0kg Date: Tue, 3 Dec 2019 23:57:48 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5C13E50@ORSMSX114.amr.corp.intel.com> References: <20191128010614.43628-1-michael.a.kubacki@intel.com> <20191128010614.43628-39-michael.a.kubacki@intel.com> In-Reply-To: <20191128010614.43628-39-michael.a.kubacki@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYmZjODgwODktNjk1Yy00ZWZmLTk5MmEtMjJkZjAwZDBjYzc2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRGJmNDNCZTZxRE94XC9oSFlOSjFaS2Q0OXgycXBSMk9vWVArR0hYQlRWM09rb2F2clUwdjJiaFJtWGZPTjBtaVUifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: devel@edk2.groups.io On Behalf Of Kubacki, Mi= chael A Sent: Wednesday, November 27, 2019 5:06 PM To: devel@edk2.groups.io Cc: Wei, David Y ; Agyeman, Prince Subject: [edk2-devel] [edk2-platforms][PATCH V2 38/47] SimicsOpenBoardPkg:= Use new advanced feature refactor Updates advanced feature references in SimicsOpenBoardPkg to the new advan= ced feature packages in Features/Intel. Previously, the advanced features i= n 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 fea= ture refactor. Note that SimicsOpenBoardPkg depends upon these advanced features even whe= n 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 f= ollowing Bugzilla item: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2165 Cc: Wei David Y Cc: Agyeman Prince Signed-off-by: Michael Kubacki --- 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 =3D FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE =20 + !include=20 + AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.d + sc !include $(PROJECT)/OpenBoardPkgPcd.dsc - !include NetworkPkg/NetworkDefines.dsc.inc + !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 #########################################################################= ####### # @@ -80,7 +81,6 @@ # is completed [Components.X64] !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc -!include AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc =20 ####################################### # Build Option Includes @@ -285,13 +285,6 @@ $(PLATFORM_PACKAGE)/Flash/SpiFvbService/SpiFvbServiceSmm.inf !endif =20 - ####################################### - # Advanced Feature Package - ####################################### -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable =3D=3D TRUE - AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf -!endif - ####################################### # Board Package ####################################### diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgP= cd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.ds= c 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 =20 [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|"20= 19-08-09" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosVersion|"Ver.1.= 0.0" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType1StringProductName|"QSP UE= FI BIOS" + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType2StringProductName|"QSP UE= FI BIOS" =20 [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 =20 INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf INF $(SKT_PKG)/Smm/Access/SmmAccessPei.inf @@ -199,6 +198,7 @@ INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataContro= llerDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf =20 !include MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf +!include AdvancedFeaturePkg/Include/PostMemory.fdf INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutor= Dxe.inf INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -238,12 +238,6 @@ INF ShellPkg/Application/Shell/Shell.inf # INF SimicsIch10BinPkg/UndiBinary/UndiDxe.inf =20 -!include AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf - -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable =3D=3D TRUE - INF AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf -!endif - !include MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf =20 [FV.FVMAIN_COMPACT] diff --git a/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPla= tformDxe.inf b/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPl= atformDxe.inf index 3cc6a03564..f8ecab08e6 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatformDx= e.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 =20 [LibraryClasses] -- 2.16.2.windows.1