From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com []) by mx.groups.io with SMTP id smtpd.web10.2401.1573615709373949821 for ; Tue, 12 Nov 2019 19:29:06 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.a.kubacki@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Nov 2019 19:29:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,299,1569308400"; d="scan'208";a="379090899" Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga005.jf.intel.com with ESMTP; 12 Nov 2019 19:29:06 -0800 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Wei David Y , Agyeman Prince Subject: [edk2-platforms][PATCH V1 12/49] SimicsOpenBoardPkg: Remove advanced feature references Date: Tue, 12 Nov 2019 19:27:38 -0800 Message-Id: <20191113032816.4056-13-michael.a.kubacki@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20191113032816.4056-1-michael.a.kubacki@intel.com> References: <20191113032816.4056-1-michael.a.kubacki@intel.com> Removes references to advanced features in the package to prepare for an advanced feature refactor that will impact the location of features and details such as package names and PCD token space identifiers. Cc: Wei David Y Cc: Agyeman Prince Signed-off-by: Michael Kubacki --- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 17 ----------------- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc | 6 ------ Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 8 -------- Platform/Intel/SimicsOpenBoardPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 1 - 4 files changed, 32 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 35a8c7c765..761874de73 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -34,16 +34,7 @@ DEFINE SMM_REQUIRE = TRUE - # - # PLATFORMX64_ENABLE is set to TRUE when PEI is IA32 and DXE is X64 platform - # - DEFINE PLATFORMX64_ENABLE = TRUE - DEFINE NETWORK_TLS_ENABLE = FALSE - DEFINE NETWORK_ISCSI_ENABLE = FALSE - DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE - !include $(PROJECT)/OpenBoardPkgPcd.dsc - !include NetworkPkg/NetworkDefines.dsc.inc ################################################################################ # @@ -76,7 +67,6 @@ [Components.X64] !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc -!include AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc ####################################### # Build Option Includes @@ -271,13 +261,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..1383a63d36 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc @@ -96,8 +96,6 @@ ###################################### # Advanced Feature Configuration ###################################### - gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable|TRUE - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable|TRUE [PcdsFeatureFlag.X64] ###################################### @@ -252,10 +250,6 @@ ###################################### # Advanced Feature Configuration ###################################### - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosReleaseDate|"2019-08-09" - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType0StringBiosVersion|"Ver.1.0.0" - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType1StringProductName|"QSP UEFI BIOS" - gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosType2StringProductName|"QSP UEFI BIOS" [PcdsDynamicExDefault] ###################################### diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf index ef6b35c92f..d29835f606 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf @@ -155,7 +155,6 @@ 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 INF $(BOARD_PKG)/SimicsPei/SimicsPei.inf !include $(SKT_PKG)/SktPostMemoryInclude.fdf !include $(PCH_PKG)/IchPostMemoryInclude.fdf @@ -163,7 +162,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 @@ -238,12 +236,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/SmbiosPlatformDxe.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