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:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=RTIo1vXc; 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=qgTFDKYWY5QyKhvynbV98qiwglx1WcpCFAtI+VJLj+4=; b=RTIo1vXcCapCGlMhozL5aeRNuGh613824URIMet7iAblFk2O4MhFf/ce 2NK3GXpyINwSOPF82KHx1RsOOQ3p2QnaAtanexxcEjMCQlY+FQUd0hMmY zX40ppGu79a+MKUuOLTQHOtGLlqIcKXrmG7nmquwY96OBoxYHASvffwN4 nb74BD3KnnULq4I+lCa2ATPwqbPnhXAHDIsAu8S553NPJ0bTEfB5EyQhR W/m2UfwM5yxBWiCUpCTeot07ambxT2vuVzDPnlj7nBsTKEyIwA0VquU4D u+oLGRw/lFHU/9D59KXX9Kt6v9sz/hFnqJifLo/Z8o5P3bXpmgo93lcbz w==; X-IronPort-AV: E=McAfee;i="6400,9594,10416"; a="288138262" X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="288138262" 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="666767966" 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 , Nate DeSimone , Chasel Chiu Subject: [edk2-devel][edk2-platforms][PATCH V1 04/13] WhitleyOpenBoardPkg/Build: Reduce unnecessary code Date: Fri, 22 Jul 2022 11:46:15 -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 Use MinPlatformFeaturesPcd.dsc.inc to initialize feature PCD Move individual feature enabling examples to BoardPortTemplate Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../Aowanda/PlatformPkg.dsc | 3 -- .../BoardPortTemplate/PlatformPkg.dsc | 50 ++++++++++++++++++ .../JunctionCity/PlatformPkg.dsc | 3 -- .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 51 ------------------- 4 files changed, 50 insertions(+), 57 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc index 63648172da..8761f8b56a 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc @@ -26,9 +26,6 @@ !if $(gMinPlatformPkgTokenSpaceGuid.PcdBootStage) >= 5 gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |TRUE gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |TRUE -!else - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |FALSE - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE !endif !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc index e3e8ceb7ce..9bf5d02a3d 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc @@ -15,6 +15,56 @@ !include $(RP_PKG)/PlatformPkg.dsc +# +# Feature enable/disable flags +# +[PcdsFeatureFlag] + # + # MinPlatform control flags + # + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |TRUE + + # + # Debugging features + # + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable |FALSE + gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable |FALSE + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable |FALSE + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable |FALSE + + # + # Network features + # + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE + + # + # OutOfBandManagement features + # + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |FALSE + gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable |FALSE + + # + # PowerManagement features + # + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable |FALSE + + # + # SystemInformation features + # + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable |FALSE + + # + # UserInterface features + # + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |FALSE + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |FALSE + gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |FALSE + +!include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc + [Defines] DEFINE BOARD_NAME = BoardPortTemplate PLATFORM_GUID = f3518dd4-5dec-4d2c-9ac9-561121e2628b diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc index 8cedbaccee..8e226c1552 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc @@ -26,9 +26,6 @@ !if $(gMinPlatformPkgTokenSpaceGuid.PcdBootStage) >= 5 gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |TRUE gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |TRUE -!else - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |FALSE - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE !endif !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc index 5b5d84779e..0ff9c00b94 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc @@ -59,57 +59,6 @@ [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 - # - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable |FALSE - gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable |FALSE - gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable |FALSE - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable |FALSE - - # - # Network features - # - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE - - # - # OutOfBandManagement features - # - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |FALSE - gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable |FALSE - - # - # PowerManagement features - # - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable |FALSE - - # - # SystemInformation features - # - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable |FALSE - - # - # UserInterface features - # - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |FALSE - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |FALSE - gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |FALSE - -!include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc - # # Platform On/Off features are defined here # -- 2.36.1.windows.1