From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.5453.1575010898565741113 for ; Thu, 28 Nov 2019 23:01:38 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: chasel.chiu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 23:01:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,256,1571727600"; d="scan'208";a="212205830" Received: from pgsmsx104.gar.corp.intel.com ([10.221.44.91]) by orsmga003.jf.intel.com with ESMTP; 28 Nov 2019 23:01:08 -0800 Received: from pgsmsx111.gar.corp.intel.com ([169.254.2.24]) by PGSMSX104.gar.corp.intel.com ([10.221.44.91]) with mapi id 14.03.0439.000; Fri, 29 Nov 2019 15:01:07 +0800 From: "Chiu, Chasel" To: "Kubacki, Michael A" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" Subject: Re: [edk2-platforms][PATCH V2 36/47] KabylakeOpenBoardPkg/KabylakeRvp3: Enable advanced features Thread-Topic: [edk2-platforms][PATCH V2 36/47] KabylakeOpenBoardPkg/KabylakeRvp3: Enable advanced features Thread-Index: AQHVpYheR10ik4k7tkaTtOjIdYY2p6ehunSw Date: Fri, 29 Nov 2019 07:01:06 +0000 Message-ID: <3C3EFB470A303B4AB093197B6777CCEC505B1F8A@PGSMSX111.gar.corp.intel.com> References: <20191128010614.43628-1-michael.a.kubacki@intel.com> <20191128010614.43628-37-michael.a.kubacki@intel.com> In-Reply-To: <20191128010614.43628-37-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzI1Njg4Y2MtZTkxMC00YTc0LTg1NDYtNmJjNTJlOGQyMzUwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZWJoWHdvOUtUdTZQTStpN3NGTTNQTnB6WTd6ZHpFSFRDc3lCcDY4NE9oTWM2M0ZaNTBqSmtmM2l2cjFXUVJoSiJ9 x-ctpclassification: CTP_NT x-originating-ip: [172.30.20.206] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu > -----Original Message----- > From: Kubacki, Michael A > Sent: Thursday, November 28, 2019 9:06 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > > Subject: [edk2-platforms][PATCH V2 36/47] > KabylakeOpenBoardPkg/KabylakeRvp3: Enable advanced features >=20 > This change enables advanced features to be used by the > KabylakeRvp3 board in KabylakeOpenBoardPkg. >=20 > Some platform macros in OpenBoardPkg.dsc are consolidated so all values > are set at the top of the file before including advanced feature code. >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Signed-off-by: Michael Kubacki > Reviewed-by: Nate DeSimone > --- > Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > | 44 +++++++++----------- >=20 > Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc > | 1 + > Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > | 4 ++ > 3 files changed, 25 insertions(+), 24 deletions(-) >=20 > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > index 831e441d70..50be2bb624 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > @@ -15,11 +15,31 @@ > DEFINE PROJECT =3D > $(PLATFORM_BOARD_PACKAGE)/$(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 > + =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 > + > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > und.d > + sc > !include OpenBoardPkgPcd.dsc > + !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc >=20 > [Defines] > !if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection =3D=3D 1 @@ > -51,30 +71,6 @@ !endif !endif >=20 > -############################################################### > ################# > -# > -# Defines Section - statements that will be processed to create a Makefi= le. > -# > -############################################################### > ################# > -[Defines] > - 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 > - DEFINE TOP_MEMORY_ADDRESS =3D 0x0 > - > - # > - # Default value for OpenBoardPkg.fdf use > - # > - DEFINE BIOS_SIZE_OPTION =3D SIZE_70 > - >=20 > ################################################################ > ################ > # > # SKU Identification section - list of all SKU IDs supported by this boa= rd. > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d > sc > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d > sc > index 5474edd01c..916b5189fe 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d > sc > +++ > 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 59f764f49c..fc1c6a9c25 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > @@ -638,6 +638,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 > $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf > !endif > @@ -664,6 +666,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