From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: chasel.chiu@intel.com)
Received: from mga06.intel.com (mga06.intel.com [134.134.136.31])
 by groups.io with SMTP; Tue, 08 Oct 2019 08:45:33 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga001.jf.intel.com ([10.7.209.18])
  by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 08:45:32 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.67,270,1566889200"; 
   d="scan'208";a="277133231"
Received: from pgsmsx108.gar.corp.intel.com ([10.221.44.103])
  by orsmga001.jf.intel.com with ESMTP; 08 Oct 2019 08:45:31 -0700
Received: from pgsmsx112.gar.corp.intel.com ([169.254.3.2]) by
 PGSMSX108.gar.corp.intel.com ([169.254.8.87]) with mapi id 14.03.0439.000;
 Tue, 8 Oct 2019 23:45:30 +0800
From: "Chiu, Chasel" <chasel.chiu@intel.com>
To: "Kubacki, Michael A" <michael.a.kubacki@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
CC: "Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>
Subject: Re: [edk2-platforms][PATCH V1 01/17] KabylakeOpenBoardPkg/KabylakeRvp3: Remove OpenBoardPkgConfig.dsc
Thread-Topic: [edk2-platforms][PATCH V1 01/17]
 KabylakeOpenBoardPkg/KabylakeRvp3: Remove OpenBoardPkgConfig.dsc
Thread-Index: AQHVfZeepyudXEniYE6k4NnB3SCGm6dQ436g
Date: Tue, 8 Oct 2019 15:45:29 +0000
Message-ID: <3C3EFB470A303B4AB093197B6777CCEC504F1FA6@PGSMSX112.gar.corp.intel.com>
References: <20191008051645.22052-1-michael.a.kubacki@intel.com>
 <20191008051645.22052-2-michael.a.kubacki@intel.com>
In-Reply-To: <20191008051645.22052-2-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjg1YjgwNmItMWYxNS00Y2IzLWI5MmItYjIxOGFiOGM5ZjY3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUkhVOWV0U25USGxaa1lpcHBFQXdlbmNcL1N6Z05WYWlSSUVCQVdHc2FwQVh5NnhZNDV3N0plRGJRTnR3RFlNeVgifQ==
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 <chasel.chiu@intel.com>

> -----Original Message-----
> From: Kubacki, Michael A <michael.a.kubacki@intel.com>
> Sent: Tuesday, October 8, 2019 1:16 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V1 01/17]
> KabylakeOpenBoardPkg/KabylakeRvp3: Remove OpenBoardPkgConfig.dsc
>=20
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2242
>=20
> The location for PCD configuration is currently inconsistent in
> KabylakeOpenBoardPkg. A large set of FeaturePCD definitions are in
> OpenBoardPkgConfig.dsc while other PCD definitions (including
> FeaturePCD) are located in OpenBoardPkgPcd.dsc.
>=20
> This change consolidates PCD configuration for the KabylakeRvp3 board to
> OpenBoardPkgPcd.dsc and removes OpenBoardPkgConfig.dsc.
>=20
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
> ---
>  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> |   1 -
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig.d
> sc | 138 --------------------
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
> | 132 ++++++++++++++++++-
>  3 files changed, 130 insertions(+), 141 deletions(-)
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> index 7090852192..a3378d3c5d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> @@ -22,7 +22,6 @@
>    #
>    # Platform On/Off features are defined here
>    #
> -  !include OpenBoardPkgConfig.dsc
>    !include OpenBoardPkgPcd.dsc
>=20
>  [Defines]
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig
> .dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfi
> g.dsc
> deleted file mode 100644
> index 15468494dd..0000000000
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig
> .dsc
> +++ /dev/null
> @@ -1,138 +0,0 @@
> -## @file
> -#  Platform configuration file.
> -#
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>=
 -# -#
> SPDX-License-Identifier: BSD-2-Clause-Patent -# -##
> -
> -[PcdsFixedAtBuild]
> -  #
> -  # Please select BootStage here.
> -  # Stage 1 - enable debug (system deadloop after debug init)
> -  # Stage 2 - mem init (system deadloop after mem init)
> -  # Stage 3 - boot to shell only
> -  # Stage 4 - boot to OS
> -  # Stage 5 - boot to OS with security boot enabled
> -  #
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4
> -
> -[PcdsFeatureFlag]
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 1
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 2
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 3
> -  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 4
> -  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> -!endif
> -
> -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 5
> -  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE
> -  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE
> -!endif
> -
> -  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
> -  #
> -  # More fine granularity control below:
> -  #
> -
> -
> -  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> -
> -
> -
> -#
> -# TRUE is ENABLE. FALSE is DISABLE.
> -#
> -
> -#
> -# BIOS build switches configuration
> -#
> -  gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> -
> -# CPU
> -  gSiPkgTokenSpaceGuid.PcdSourceDebugEnable|FALSE
> -  gSiPkgTokenSpaceGuid.PcdTxtEnable|TRUE  #Set to FALSE for GCC Build
> @todo Convert TXT ASM to NASM
> -  gSiPkgTokenSpaceGuid.PcdBiosGuardEnable|TRUE
> -
> -# SA
> -  gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSkycamEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdGmmEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSaOcEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE
> -
> -# ME
> -  gSiPkgTokenSpaceGuid.PcdAmtEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE
> -
> -  gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdBootGuardEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE
> -  gSiPkgTokenSpaceGuid.PcdEvLoaderEnable|FALSE
> -  gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSerialGpioEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSoftwareGuardEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSsaFlagEnable|FALSE
> -  gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE
> -  gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|FALSE
> -
> -#
> -# Override some PCDs for specific build requirements.
> -#
> -  #
> -  # Disable USB debug message when Source Level Debug is enabled
> -  # because they cannot be enabled at the same time.
> -  #
> -
> -    gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE
> -    gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE
> -    gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE
> -
> -
> -
> -  !if $(TARGET) =3D=3D DEBUG
> -    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> -  !else
> -    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> -  !endif
> -
> -  !if $(TARGET) =3D=3D DEBUG
> -    gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
> -  !else
> -    gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
> -  !endif
> -
> -    gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
> -
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> index 2009bb225a..edb4013cc0 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> +++ sc
> @@ -12,7 +12,135 @@
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform =
 #
> ################################################################
> ################
> +[PcdsFixedAtBuild]
> +  #
> +  # Please select BootStage here.
> +  # Stage 1 - enable debug (system deadloop after debug init)
> +  # Stage 2 - mem init (system deadloop after mem init)
> +  # Stage 3 - boot to shell only
> +  # Stage 4 - boot to OS
> +  # Stage 5 - boot to OS with security boot enabled
> +  #
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4
> +
>  [PcdsFeatureFlag.common]
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 1
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE
> +!endif
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 2
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE
> +!endif
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 3
> +  gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE
> +!endif
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 4
> +  gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
> +!endif
> +
> +!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >=3D 5
> +  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE
> +  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE
> +!endif
> +
> +  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
> +  #
> +  # More fine granularity control below:
> +  #
> +
> +
> +  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> +
> +
> +
> +#
> +# TRUE is ENABLE. FALSE is DISABLE.
> +#
> +
> +#
> +# BIOS build switches configuration
> +#
> +  gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> +
> +# CPU
> +  gSiPkgTokenSpaceGuid.PcdSourceDebugEnable|FALSE
> +  gSiPkgTokenSpaceGuid.PcdTxtEnable|TRUE  #Set to FALSE for GCC Build
> +@todo Convert TXT ASM to NASM
> +  gSiPkgTokenSpaceGuid.PcdBiosGuardEnable|TRUE
> +
> +# SA
> +  gSiPkgTokenSpaceGuid.PcdIgdEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdPegEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSgEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSaDmiEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSkycamEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdGmmEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSaOcEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdVtdEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable|TRUE
> +
> +# ME
> +  gSiPkgTokenSpaceGuid.PcdAmtEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdAtaEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdPttEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdJhiEnable|TRUE
> +
> +  gSiPkgTokenSpaceGuid.PcdAcpiEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdBdatEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdBootGuardEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdIntegratedTouchEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdCpuPowerOnConfigEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSiCsmEnable|FALSE
> +  gSiPkgTokenSpaceGuid.PcdEvLoaderEnable|FALSE
> +  gSiPkgTokenSpaceGuid.PcdTraceHubEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdPpmEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdS3Enable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSerialGpioEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSmbiosEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSmmVariableEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSoftwareGuardEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSsaFlagEnable|FALSE
> +  gSiPkgTokenSpaceGuid.PcdOcWdtEnable|TRUE
> +  gSiPkgTokenSpaceGuid.PcdSiCatalogDebugEnable|FALSE
> +
> +#
> +# Override some PCDs for specific build requirements.
> +#
> +  #
> +  # Disable USB debug message when Source Level Debug is enabled
> +  # because they cannot be enabled at the same time.
> +  #
> +
> +    gSiPkgTokenSpaceGuid.PcdPttEnable|FALSE
> +    gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE
> +    gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE
> +
> +
> +
> +  !if $(TARGET) =3D=3D DEBUG
> +    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> +  !else
> +    gSiPkgTokenSpaceGuid.PcdOptimizeCompilerEnable|TRUE
> +  !endif
> +
> +  !if $(TARGET) =3D=3D DEBUG
> +    gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE
> +  !else
> +    gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE
> +  !endif
> +
> +  gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE
> +
>    gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE
>=20
> gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSection
> First|FALSE
>  !if $(TARGET) =3D=3D RELEASE
> @@ -274,7 +402,7 @@ gSiPkgTokenSpaceGuid.PcdTsegSize|0x800000
>    #
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0x0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0x0
> -
> +
>=20
> gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
>=20
>  [PcdsDynamicDefault.common.DEFAULT]
> @@ -283,7 +411,7 @@ gSiPkgTokenSpaceGuid.PcdTsegSize|0x800000
>    gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1
> -
> +
>  # Tbt
>  gBoardModuleTokenSpaceGuid.PcdDTbtControllerEn | 0x1
> gBoardModuleTokenSpaceGuid.PcdDTbtControllerType | 0x1
> --
> 2.16.2.windows.1