From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: michael.a.kubacki@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Mon, 07 Oct 2019 22:17:19 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Oct 2019 22:17:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,269,1566889200"; d="scan'208";a="205297382" Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga002.jf.intel.com with ESMTP; 07 Oct 2019 22:17:19 -0700 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Agyeman Prince , Wei David Y Subject: [edk2-platforms][PATCH V1 14/17] SimicsOpenBoardPkg/BoardX58Ich10: Relocate DSC includes Date: Mon, 7 Oct 2019 22:16:42 -0700 Message-Id: <20191008051645.22052-15-michael.a.kubacki@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20191008051645.22052-1-michael.a.kubacki@intel.com> References: <20191008051645.22052-1-michael.a.kubacki@intel.com> This change moves the following DSC file includes to the top of the OpenBoardPkg.dsc file. This is to improve visibility and align placement of the include with other board DSC files. * OpenBoardPkgConfig.dsc * OpenBoardPkgPcd.dsc * CorePeiLib.dsc * CoreDxeLib.dsc Cc: Agyeman Prince Cc: Wei David Y Signed-off-by: Michael Kubacki --- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 21 +++++++------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 59e13154a7..be29737c16 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -39,7 +39,11 @@ DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE + + !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgConfig.dsc + !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgPcd.dsc !include NetworkPkg/NetworkDefines.dsc.inc + ################################################################################ # # SKU Identification section - list of all SKU IDs supported by this Platform. @@ -54,12 +58,9 @@ # ################################################################################ -[PcdsFeatureFlag] - # - # Platform On/Off features are defined here - # - !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgConfig.dsc !include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc + !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc + !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc !include $(PCH_PKG)/IchCommonLib.dsc [LibraryClasses] @@ -76,17 +77,13 @@ SiliconPolicyInitLib|$(BOARD_PKG)/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf SiliconPolicyUpdateLib|$(BOARD_PKG)/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf PciSegmentInfoLib|MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf - - !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc - S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf AslUpdateLib|MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf LogoLib|$(BOARD_PKG)/Library/DxeLogoLib/DxeLogoLib.inf + [LibraryClasses.common.SEC] ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf -[LibraryClasses.common.PEI_CORE] - [LibraryClasses.common.PEIM] PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf @@ -97,16 +94,12 @@ !endif TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf - !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc - [LibraryClasses.common.DXE_DRIVER] PlatformBootManagerLib|$(BOARD_PKG)/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf [LibraryClasses.common.DXE_SMM_DRIVER] SpiFlashCommonLib|$(PCH_PKG)/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf - !include $(BOARD_PKG)/$(BOARD_NAME)/OpenBoardPkgPcd.dsc - [Components.IA32] $(BOARD_PKG)/SecCore/SecMain.inf { -- 2.16.2.windows.1