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.web10.11550.1658515598037244054 for ; Fri, 22 Jul 2022 11:46:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=InB+EQ+B; 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=1658515598; x=1690051598; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kzNlkyfMLxRNEaeyOlJ71RL5yPXveEgNIPqM1OdrPVw=; b=InB+EQ+BkpRbfcAVr/7XRP0130TXbDGxqHowYIOs/tQ0jYzDcl4RQ9Ve qd6HFGXKwdFdub8VFu3oNV+5PD8CnRfFEBegOTpiVI5f5L8YFN+4CNCBW XOfk5RhjhHEeQCJ4UlP6S/oj4xoP1VKdgTSF3CE13+OJWfMiv+ctHtxOK /2Rin1Sf7sxm3fkiLZR6adtFfHyo6ir4z7h+qn+KwbAylF5AA2OUQa4+X exOSPhgVDWl98xCpU2KwdQyHFUXZkhyPzPmterbdansM6mhteUiCg1yzd AlEwlHuVBhosFXjWulvZeHHuV7ilhPqrsGmbPvrE8MlsCN3SVlca9BS0B Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10416"; a="288138260" X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="288138260" 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:37 -0700 X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="666767959" 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:37 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Nate DeSimone , Chasel Chiu Subject: [edk2-devel][edk2-platforms][PATCH V1 02/13] WhitleyOpenBoardPkg/Build: Reduce duplicate code Date: Fri, 22 Jul 2022 11:46:13 -0700 Message-Id: X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Leverage common includes for default feature values. Remove PERFORMANCE_ENABLE in favor of PcdPerformanceEnable. Use DpDynamicCommand instead of standalone DpApp. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- ...blePerformanceMonitoringInfrastructure.dsc | 5 +-- ...anceMonitoringInfrastructurePostMemory.fdf | 5 +-- ...manceMonitoringInfrastructurePreMemory.fdf | 2 +- .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 45 ++++++++++++++----- .../WhitleyOpenBoardPkg/PlatformPkgConfig.dsc | 2 - 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc index c308e0df4f..7439b2fb36 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc @@ -6,7 +6,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(PERFORMANCE_ENABLE) == TRUE +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdEdkiiFpdtStringRecordEnableOnly|TRUE @@ -34,7 +34,6 @@ [Components.X64] MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf - MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf !endif diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf index a3576bd7a8..52b79a31d0 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf @@ -6,9 +6,8 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(PERFORMANCE_ENABLE) == TRUE +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf - INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - INF ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf + INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf !endif diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf index dbc98f6f1f..18574f67ef 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf @@ -6,6 +6,6 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(PERFORMANCE_ENABLE) == TRUE +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf !endif diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc index cefee8273b..5b5d84779e 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc @@ -39,12 +39,39 @@ DEFINE IIO_INSTANCE = UnknownCpu !endif +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# Optional MinPlatformPkg features should be enabled after this +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + +# +# AdvancedFeature common include for feature enable/disable PCD +# +# !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +# +# PCD required by advanced features +# [PcdsFixedAtBuild] gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 +# +# Feature enable/disable flags +# [PcdsFeatureFlag] + # + # MinPlatform control flags + # + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |TRUE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |TRUE + # # Debugging features # @@ -124,20 +151,16 @@ # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ -[PcdsFeatureFlag] - # - # MinPlatform control flags - # - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +[PcdsFeatureFlag] + # # don't degrade 64bit MMIO space to 32-bit + # gEfiMdeModulePkgTokenSpaceGuid.PcdPciDegradeResourceForOptionRom|FALSE + # # Server doesn't support capsule update on Reset. + # gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|FALSE @@ -761,13 +784,13 @@ UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf { - !if $(PERFORMANCE_ENABLE) == TRUE + !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE TimerLib|UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf !endif } [Components.X64] - !include WhitleyOpenBoardPkg/Include/Dsc/CoreDxeInclude.dsc + !include MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc $(RP_PKG)/Platform/Dxe/PlatformType/PlatformType.inf diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc index a4ac8b6935..c9620f11d8 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkgConfig.dsc @@ -15,8 +15,6 @@ DEFINE CRB_FLAG_ENABLE = TRUE DEFINE DEBUG_FLAGS_ENABLE = FALSE -DEFINE PERFORMANCE_ENABLE = TRUE - DEFINE SERVER_BIOS_ENABLE = TRUE DEFINE PCH_SERVER_BIOS_ENABLE = TRUE -- 2.36.1.windows.1