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=ErLTibWs; 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=oT+hnDKhMLJVDgXYrCd+n3xMy2+f4LymkOvr4mcihcs=; b=ErLTibWsZ04j6GeStPjHwmUbe7ZkkuxBeNgW9JlNYEoJWWQhHH+4lJXf a6Md7XWBYYl7CdQoPOG+dqHx8lLqZmA5CygMFY6dVqNGrpRD+4UpSAngL Ans4nOSqoXUclE4KmrKxvYBgy/yW2UPGmKIamiAS+Ko5vxojp114irFYR 4nxebWDBmHHj+Yx0CN9pYsOb5VPW12Ip8Gr7UmPMu7vuSG4haDIxjg+Wj qe6cLmwXcnMWu2MwZRJ5T6daI3LOI6vU0VTUTn3/FqKFFlcQXKA4mmzu7 AyQhwiC1wz88vjkO7bbPeN8oAMxS1686xoVDa5sjDOLLYEpgCYzhgrIE/ w==; X-IronPort-AV: E=McAfee;i="6400,9594,10416"; a="288138261" X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="288138261" 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="666767963" 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 , Sai Chaganty , Nate DeSimone , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 03/13] Features/Intel: Reduce duplicate code Date: Fri, 22 Jul 2022 11:46:14 -0700 Message-Id: <2efb22612de62016524ab4d5321dd495781c90a7.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 Enable simpler initialation of the MinPlatformPkg feature selection PCD. Most features and boards don't benefit from initializing these. Cc: Sai Chaganty Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Isaac Oram --- .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 13 ++++++------- .../AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc | 12 ++++-------- .../BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc | 15 +++++++-------- .../PostCodeDebugFeaturePkg.dsc | 15 +++++++-------- .../NetworkFeaturePkg/NetworkFeaturePkg.dsc | 13 ++++++------- .../IpmiFeaturePkg/IpmiFeaturePkg.dsc | 13 ++++++------- .../SpcrFeaturePkg/SpcrFeaturePkg.dsc | 13 ++++++------- .../PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 13 ++++++------- .../SmbiosFeaturePkg/SmbiosFeaturePkg.dsc | 13 ++++++------- .../TemplateFeaturePkg/TemplateFeaturePkg.dsc | 13 ++++++------- .../LogoFeaturePkg/LogoFeaturePkg.dsc | 12 ++++++------ .../UserAuthFeaturePkg/UserAuthFeaturePkg.dsc | 13 ++++++------- .../VirtualKeyboardFeaturePkg.dsc | 13 ++++++------- 13 files changed, 78 insertions(+), 93 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 28530b8c67..b572f2eda8 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -88,13 +88,12 @@ [PcdsFixedAtBuild] gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 -[PcdsFeatureFlag] - # - # MinPlatform common include currently required PCD - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc index 3b76d39ea8..306d8bce16 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc @@ -28,15 +28,11 @@ MinPlatformPkg/MinPlatformPkg.dec # -# Since there are no 32b libraries or components in this package, these PCD are specified for 64b only +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. # -[PcdsFeatureFlag.X64] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc index 56cad020bf..cad4e30aa3 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc @@ -28,17 +28,16 @@ MinPlatformPkg/MinPlatformPkg.dec BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE - [PcdsDynamicExDefault] gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|TRUE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + # # Include common libraries # diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc index 349604098f..16642e6c59 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc @@ -27,20 +27,19 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE - [PcdsDynamicExDefault] # # PCD needed for this feature to build # gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode|TRUE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + # # Include common libraries # diff --git a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc index cdc5dc851d..87060714e7 100644 --- a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc +++ b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc index c35e1e174e..76d2c45a73 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc @@ -28,13 +28,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc index 2ee874a58e..8d71939a16 100644 --- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc index e16a1f8d00..2d1d197b2a 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc +++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc index e72b341154..5a9ff5b1b8 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc b/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc index 03657047dc..191173051f 100644 --- a/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc +++ b/Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc index 5a6436178c..ffcd104a3e 100644 --- a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc +++ b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc @@ -31,12 +31,12 @@ [PcdsFeatureFlag] gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSE - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc index 10360c5737..8af4dd4cd9 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc index 6717c892f1..d13bd673d3 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc @@ -27,13 +27,12 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries -- 2.36.1.windows.1