From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1203.1573864625626792073 for ; Fri, 15 Nov 2019 16:37:05 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: nathaniel.l.desimone@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 fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Nov 2019 16:37:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,310,1569308400"; d="scan'208";a="380087797" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by orsmga005.jf.intel.com with ESMTP; 15 Nov 2019 16:37:04 -0800 Received: from orsmsx157.amr.corp.intel.com (10.22.240.23) by ORSMSX106.amr.corp.intel.com (10.22.225.133) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 15 Nov 2019 16:37:04 -0800 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.67]) by ORSMSX157.amr.corp.intel.com ([169.254.9.64]) with mapi id 14.03.0439.000; Fri, 15 Nov 2019 16:37:04 -0800 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Kubacki, Michael A" CC: "Chiu, Chasel" Subject: Re: [edk2-devel] [edk2-platforms][PATCH V1 45/49] KabylakeOpenBoardPkg/KabylakeRvp3: Enable advanced features Thread-Topic: [edk2-devel] [edk2-platforms][PATCH V1 45/49] KabylakeOpenBoardPkg/KabylakeRvp3: Enable advanced features Thread-Index: AQHVmdws1VkyqVh9n0WzKCHaun5DEaeMq88Q Date: Sat, 16 Nov 2019 00:37:03 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5BDB812@ORSMSX114.amr.corp.intel.com> References: <20191113043742.23488-1-michael.a.kubacki@intel.com> <20191113043742.23488-6-michael.a.kubacki@intel.com> In-Reply-To: <20191113043742.23488-6-michael.a.kubacki@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOWI4MDkzNWItYzU3ZC00ZTc1LWFkNzUtNDE5MTYyY2JhYjQ4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidWFrU1hLUlQ2NlpnZ1MzU1d1NWpFYUR1YWNzd245REo5ejdnUmsxeWE3Nks2ZUpOUkRmRHZtaklJTGtoY0hsNCJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: devel@edk2.groups.io On Behalf Of Kubacki, Mi= chael A Sent: Tuesday, November 12, 2019 8:38 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L Subject: [edk2-devel] [edk2-platforms][PATCH V1 45/49] KabylakeOpenBoardPk= g/KabylakeRvp3: Enable advanced features This change enables advanced features to be used by the KabylakeRvp3 board in KabylakeOpenBoardPkg. Some platform macros in OpenBoardPkg.dsc are consolidated so all values ar= e set at the top of the file before including advanced feature code. Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Michael Kubacki --- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 44= +++++++++----------- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 1= + Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 4= ++ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg= .dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc index e4f0fcb1b5..4b24f6b8c9 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc @@ -15,11 +15,31 @@ DEFINE PROJECT =3D $(PLATFORM_BOARD_PACKAG= E)/$(BOARD) DEFINE PEI_ARCH =3D IA32 DEFINE DXE_ARCH =3D X64 + DEFINE TOP_MEMORY_ADDRESS =3D 0x0 + + # + # Default value for OpenBoardPkg.fdf use # DEFINE BIOS_SIZE_OPTION=20 + =3D SIZE_70 + + PLATFORM_NAME =3D $(PLATFORM_PACKAGE) + PLATFORM_GUID =3D 8470676C-18E8-467F-B126= -28DB1941AA5A + PLATFORM_VERSION =3D 0.1 + DSC_SPECIFICATION =3D 0x00010005 + OUTPUT_DIRECTORY =3D Build/$(PROJECT) + SUPPORTED_ARCHITECTURES =3D IA32|X64 + BUILD_TARGETS =3D DEBUG|RELEASE + SKUID_IDENTIFIER =3D ALL + FLASH_DEFINITION =3D $(PROJECT)/OpenBoardPkg= .fdf + + FIX_LOAD_TOP_MEMORY_ADDRESS =3D 0x0 =20 # # Include PCD configuration for this board. # + !include=20 + AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.d + sc !include OpenBoardPkgPcd.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 [Defines] !if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection =3D=3D 1 @@ -51,3= 0 +71,6 @@ !endif !endif =20 -#########################################################################= ####### -# -# Defines Section - statements that will be processed to create a Makefil= e. -# -#########################################################################= ####### -[Defines] - PLATFORM_NAME =3D $(PLATFORM_PACKAGE) - PLATFORM_GUID =3D 8470676C-18E8-467F-B126-28DB194= 1AA5A - PLATFORM_VERSION =3D 0.1 - DSC_SPECIFICATION =3D 0x00010005 - OUTPUT_DIRECTORY =3D Build/$(PROJECT) - SUPPORTED_ARCHITECTURES =3D IA32|X64 - BUILD_TARGETS =3D DEBUG|RELEASE - SKUID_IDENTIFIER =3D ALL - FLASH_DEFINITION =3D $(PROJECT)/OpenBoardPkg.fdf - - FIX_LOAD_TOP_MEMORY_ADDRESS =3D 0x0 - DEFINE TOP_MEMORY_ADDRESS =3D 0x0 - - # - # Default value for OpenBoardPkg.fdf use - # - DEFINE BIOS_SIZE_OPTION =3D SIZE_70 - #########################################################################= ####### # # SKU Identification section - list of all SKU IDs supported by this boar= d. diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg= Pcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.= dsc index 580504cbc1..eea0a0b1b2 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d +++ sc @@ -24,6 +24,7 @@ # Stage 3 - boot to shell only # Stage 4 - boot to OS # Stage 5 - boot to OS with security boot enabled + # Stage 6 - boot with advanced features enabled # gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4 =20 diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg= .fdf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf index 132015be5d..03bc559100 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf @@ -637,6 +637,8 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE FvNameGuid =3D 6053D78A-457E-4490-A237-31D0FBE2F305 =20 +!include AdvancedFeaturePkg/Include/PreMemory.fdf + !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE INF $(P= LATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf !endif @@ -663,6 +665,8 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE FvNameGuid =3D BE3DF86F-E464-44A3-83F7-0D27E6B88C27 =20 +!include AdvancedFeaturePkg/Include/PostMemory.fdf + !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE INF $(= PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf INF $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf -- 2.16.2.windows.1