From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.11538.1658515598830308993 for ; Fri, 22 Jul 2022 11:46:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=EomGFXVR; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: isaac.w.oram@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658515599; x=1690051599; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Lix7GOwhP94bsW47rnUtRNi9rXLrk2SvH5pOgMP/irM=; b=EomGFXVRBsGK1VE1ITSZW3sgZMGh8tqs4PkrbUmwhacqzbinOXs/iW6S C2NjxxC+m9eyavcH23485tWdABLL2BbETR9lRaaaQ3VPh536We7fzqsSO /UHqScB/MsLz8+GNBTb5Z2VcKbnfwKh82hTz+Ucv0/6y1p/r5jMBG72YL niXXM5W2tDNRI8od4Z78LPUAQps6g5YZfq8LF2J8pEbKzJRJHkD4hb+Ds CT1IcpmEoNsEQQcB5L/9Xjzr+6HXP5odgVVYOVdcqkJcpQClRxWTv7ARK cgGIRDnQfr90FH75rNL/CmKbZWlGVLb9/fbYIspFPJfsf02J5Vsys4Gdx g==; X-IronPort-AV: E=McAfee;i="6400,9594,10416"; a="288138264" X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="288138264" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2022 11:46:38 -0700 X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="666767970" Received: from iworam-desk.amr.corp.intel.com ([10.24.80.243]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2022 11:46:38 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Chasel Chiu , Nate DeSimone , Liming Gao , Eric Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 05/13] MinPlatformPkg/Include: Simplify build logic Date: Fri, 22 Jul 2022 11:46:16 -0700 Message-Id: <2082a8bc205a50292e6ac9d23e6c94e2a2b4e0aa.1658513099.git.isaac.w.oram@intel.com> X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Removed the logic that doesn't build some things only if you are doing a shell boot. Since they are built for stage 1 or 2, there is no porting benefit to this logic. Build simplified to build both sets of drivers. Switched from PcdSmiHandlerProfileEnable to using RELEASE build type to disable SMI profiling. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../Include/Dsc/CoreCommonLib.dsc | 6 ++--- .../Include/Dsc/CoreDxeInclude.dsc | 23 +++++++++---------- .../Dsc/MinPlatformFeaturesPcd.dsc.inc | 1 - 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index b77d55dfd5..3749199da7 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -122,10 +122,10 @@ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf !endif -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE - SmiHandlerProfileLib|MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf -!else +!if $(TARGET) == RELEASE SmiHandlerProfileLib|MdePkg/Library/SmiHandlerProfileLibNull/SmiHandlerProfileLibNull.inf +!else + SmiHandlerProfileLib|MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf !endif PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc index c2ade240f3..21570afe3f 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc @@ -29,7 +29,17 @@ PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE + # + # Emulated variables for stages 1-4 + # + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { + + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE + } + + # + # Real variables for stages 5+ + # MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { @@ -38,12 +48,6 @@ NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf } -!else - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { - - gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE - } -!endif MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf @@ -122,7 +126,6 @@ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } -!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf @@ -133,14 +136,11 @@ UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf -!endif -!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf -!endif !if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -162,4 +162,3 @@ !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf !endif - diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc index 842668a081..2d665c25c5 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc @@ -22,5 +22,4 @@ gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE -- 2.36.1.windows.1