From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com []) by mx.groups.io with SMTP id smtpd.web09.956.1574903281826413616 for ; Wed, 27 Nov 2019 17:08:06 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.a.kubacki@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Nov 2019 17:08:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,251,1571727600"; d="scan'208";a="383667998" Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga005.jf.intel.com with ESMTP; 27 Nov 2019 17:08:05 -0800 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Wei David Y , Agyeman Prince Subject: [edk2-platforms][PATCH V2 28/47] SimicsOpenBoardPkg/BoardX58Ich10: Use PEI_ARCH and DXE_ARCH Date: Wed, 27 Nov 2019 17:05:55 -0800 Message-Id: <20191128010614.43628-29-michael.a.kubacki@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20191128010614.43628-1-michael.a.kubacki@intel.com> References: <20191128010614.43628-1-michael.a.kubacki@intel.com> This change updates OpenBoardPkg.dsc to use the PEI_ARCH and DXE_ARCH specified in the DSC file for the board package components. An EDK II build limitation currently prevents the macros from being able to be used, so a todo has been placed with the action needed when the BaseTools update is completed as described in the following Bugzilla item: https://bugzilla.tianocore.org/show_bug.cgi?id=2308 The intention of this macro is to ensure that all DSC files that compose the package build (such as those included from MinPlatformPkg or an advanced feature package) build phase-specific drivers for the architecture defined by the board package. This is a macro that is required in all Minimum Platform board packages. Cc: Wei David Y Cc: Agyeman Prince Signed-off-by: Michael Kubacki Reviewed-by: Nate DeSimone --- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 35a8c7c765..2f287a4ca4 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -70,10 +70,14 @@ ####################################### # Component Includes ####################################### +# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308 +# is completed [Components.IA32] !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc !include $(SKT_PKG)/SktPkgPei.dsc +# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308 +# is completed [Components.X64] !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc !include AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc @@ -153,6 +157,11 @@ ####################################### SpiFlashCommonLib|$(PCH_PKG)/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf +####################################### +# PEI Components +####################################### +# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308 +# is completed [Components.IA32] ####################################### # Edk2 Packages @@ -202,6 +211,11 @@ PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } +####################################### +# DXE Components +####################################### +# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308 +# is completed [Components.X64] ####################################### # Edk2 Packages -- 2.16.2.windows.1