From nobody Mon Dec 23 04:30:58 2024
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain
 of lists.01.org)  smtp.mailfrom=edk2-devel-bounces@lists.01.org
Return-Path: <edk2-devel-bounces@lists.01.org>
Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com
	with SMTPS id 1521175343285547.0077461582183;
 Thu, 15 Mar 2018 21:42:23 -0700 (PDT)
Received: from [127.0.0.1] (localhost [IPv6:::1])
	by ml01.01.org (Postfix) with ESMTP id 8DCDE2264D237;
	Thu, 15 Mar 2018 21:35:53 -0700 (PDT)
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id 23F54226462FC
 for <edk2-devel@lists.01.org>; Thu, 15 Mar 2018 21:35:50 -0700 (PDT)
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
 by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 15 Mar 2018 21:42:14 -0700
Received: from shwde7172.ccr.corp.intel.com ([10.239.9.15])
 by fmsmga006.fm.intel.com with ESMTP; 15 Mar 2018 21:42:14 -0700
X-Original-To: edk2-devel@lists.01.org
Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by
 domain of lists.01.org) client-ip=198.145.21.10;
 envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org;
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=192.55.52.43; helo=mga05.intel.com;
 envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.48,313,1517904000"; d="scan'208";a="211830235"
From: Liming Gao <liming.gao@intel.com>
To: edk2-devel@lists.01.org
Date: Fri, 16 Mar 2018 12:41:54 +0800
Message-Id: <1521175314-6672-4-git-send-email-liming.gao@intel.com>
X-Mailer: git-send-email 2.8.0.windows.1
In-Reply-To: <1521175314-6672-1-git-send-email-liming.gao@intel.com>
References: <1521175314-6672-1-git-send-email-liming.gao@intel.com>
Subject: [edk2] [Patch 3/3] DscSpecification: Add structure PCD field value
 assignment syntax
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
Cc: Michael Kinney <michael.d.kinney@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Errors-To: edk2-devel-bounces@lists.01.org
Sender: "edk2-devel" <edk2-devel-bounces@lists.01.org>
X-ZohoMail: RSF_4  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>=20
---
 2_dsc_overview/28_pcd_section_processing.md           | 10 ++++++----
 3_edk_ii_dsc_file_format/310_pcd_sections.md          | 19 +++++++++++----=
----
 .../33_platform_dsc_definition.md                     |  6 +++++-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/2_dsc_overview/28_pcd_section_processing.md b/2_dsc_overview/2=
8_pcd_section_processing.md
index 1adde81..4c5d952 100644
--- a/2_dsc_overview/28_pcd_section_processing.md
+++ b/2_dsc_overview/28_pcd_section_processing.md
@@ -1,7 +1,7 @@
 <!--- @file
   2.8 PCD Section Processing
=20
-  Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
=20
   Redistribution and use in source (original document form) and 'compiled'
   forms (converted to PDF, epub, HTML and other formats) with or without
@@ -283,8 +283,9 @@ Unique PCDs are identified using the format to identify=
 the named PCD:
 `TokenSpaceGuidCName.PcdCName`
=20
 The content for a PCD in this section is the PCD's Name (PCD Token Space G=
uid
-C name, the PCD C name - separated by a period character,) and Default val=
ue.
-Field entries on a line are separated by the pipe "|" character.
+C name, the PCD C name and the optional field name - separated by a period=20
+character) and Default value. Field entries on a line are separated by the=20
+pipe "|" character.
=20
 This specification prohibits setting different PCD access methods for a si=
ngle
 PCD in different modules. The access methods here are `PcdsFixedAtBuild`,
@@ -373,7 +374,8 @@ prohibited in this type of platform description file.
 **Note:** PCD values within a section are positional, (last wins) if a PCD=
 is
 listed more than one time within a section. List a PCD in one of the other
 access methods is allowed, provided a single access method must be used fo=
r all
-instances of the PCD.
+instances of the PCD. If PCD field value is listed, it will override PCD v=
alue=20
+even if PCD value is after PCD field value.
 **********
=20
 #### 2.8.3.9 Library Instances
diff --git a/3_edk_ii_dsc_file_format/310_pcd_sections.md b/3_edk_ii_dsc_fi=
le_format/310_pcd_sections.md
index f79a0fd..4eaa15c 100644
--- a/3_edk_ii_dsc_file_format/310_pcd_sections.md
+++ b/3_edk_ii_dsc_file_format/310_pcd_sections.md
@@ -107,6 +107,9 @@ value. If not provided, the maximum length will be calc=
ulated as the largest of
 the size of the data in the DSC file, the size of the data in the INF file=
 or
 the size of the data in the DEC file that declares the PCD.
=20
+PCDs with a C strucutre type is also a VOID* PCD. Its value can be specifi=
ed like
+normal VOID* PCD, and also be specified by its structure field.
+
 Refer to the _EDK II Build Specification_ for the description of the PCD
 processing rules.
=20
@@ -218,7 +221,7 @@ fields that are separated by the pipe character, "|".
 <SkuIdS>        ::=3D <Keyword> [<FS> <Keyword>]*
 <Keyword>       ::=3D <UiName>
 <UiName>        ::=3D <Word>
-<FabStatements> ::=3D {<MacroDefinition>} {<IncludeStatement>} {<PcdEntry>}
+<FabStatements> ::=3D {<MacroDefinition>} {<IncludeStatement>} {<PcdEntry>=
} {<PcdFieldEntry>}
 <PcdEntry>      ::=3D <TS> <PcdName> [<FS> <PcdValue>] <EOL>
 <PcdValue>      ::=3D if (pcddatumtype =3D=3D "BOOLEAN"):
                       {<BoolType>} {<Expression>}
@@ -326,7 +329,7 @@ of the DSC file.
 <SkuIdS>        ::=3D <Keyword> [<FS> <Keyword>]*
 <Keyword>       ::=3D <UiName>
 <UiName>        ::=3D <Word>
-<PimStatements> ::=3D {<MacroDefinition>} {<IncludeStatement>} {<PcdEntry>}
+<PimStatements> ::=3D {<MacroDefinition>} {<IncludeStatement>} {<PcdEntry>=
} {<PcdFieldEntry>}
 <PcdEntry>      ::=3D <TS> <PcdName> [<FS> <PcdValue>] <EOL>
 <PcdValue>      ::=3D if (pcddatumtype =3D=3D "BOOLEAN"):
                       {<BoolType>} {<Expression>}
@@ -449,16 +452,16 @@ sections of the DSC file.
 <PcdsDefault>    ::=3D "[PcdsDynamicDefault" [<PddAttribs>] "]" <EOL>
                      <PddEntries>*
 <PddEntries>     ::=3D {<MacroDefinition>} {<IncludeStatement>}
-                     {<TS> <MinEntry>}
+                     {<TS> <MinEntry>} {<TS> <PcdFieldEntry>}
 <PddAttribs>     ::=3D <attrs> ["," <TS> "PcdsDynamicDefault" <attrs>]*
 <PcdsVpd>        ::=3D "[PcdsDynamicVpd" [<PdvAttribs>] "]" <EOL>
                      <PdvEntries>*
 <PdvAttribs>     ::=3D <attrs> [ "," <TS> "PcdsDynamicVpd" <attrs>]*
-<PdvEntries>     ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Vpd=
Entry>}
+<PdvEntries>     ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Vpd=
Entry>} {<TS> <PcdFieldEntry>}
 <PcdsHii>        ::=3D "[PcdsDynamicHii" [<PdhAttribs>] "]" <EOL>
                      <PcdHiiEntries>*
 <PdhAttribs>     ::=3D <phattrs> ["," <TS> "PcdsDynamicHii <phattrs>]* <Pd=
vEntries>*
-<PcdHiiEntries>  ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Hii=
Entry>}
+<PcdHiiEntries>  ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Hii=
Entry>} {<TS> <PcdFieldEntry>}
 <attrs>          ::=3D "." <arch> ["." <SkuIds>]
 <phattrs>        ::=3D "." <arch> ["." <SkuIds>]["." <DefaultStore>]
 <SkuIdS>         ::=3D <Keyword> [<FS> <Keyword>]*
@@ -662,18 +665,18 @@ sections of the DSC file.
 <Pcds>           ::=3D {<PcdsExDefault>} {<PcdsExVpd>} {<PcdsExHii>}
 <PcdsExDefault>  ::=3D "[PcdsDynamicExDefault" [<PddAttribs>] "]" <EOL>
                      <PddEntries>*
-<PddEntries>     ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Min=
Entry>}
+<PddEntries>     ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Min=
Entry>} {<TS> <PcdFieldEntry>}
 <PddAttribs>     ::=3D <attrs> ["," <TS> "PcdsDynamicExDefault" <attrs>]*
 <PcdsExVpd>      ::=3D "[PcdsDynamicExVpd" [<PdvAttribs>] "]" <EOL>
                      <PdvEntries>*
 <PdvAttribs>     ::=3D <attrs> [ "," <TS> "PcdsDynamicExVpd" <attrs>]*
 <PdvEntries>     ::=3D {<MacroDefinition>} {<IncludeStatement>}
-                     {<TS> <VpdEntry>}
+                     {<TS> <VpdEntry>} {<TS> <PcdFieldEntry>}
 <PcdsExHii>      ::=3D "[PcdsDynamicExHii" [<PdhAttribs>] "]" <EOL>
                      <PcdHiiEntries>*
 <PdhAttribs>     ::=3D <phattrs> ["," <TS> "PcdsDynamicExHii <phattrs>]*
                      <PdvEntries>*
-<PcdHiiEntries>  ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Hii=
Entry>}
+<PcdHiiEntries>  ::=3D {<MacroDefinition>} {<IncludeStatement>} {<TS> <Hii=
Entry>} {<TS> <PcdFieldEntry>}
 <attrs>          ::=3D "." <arch> ["." <SkuIds>]
 <phattrs>        ::=3D "." <arch> ["." <SkuIds>]["." <DefaultStore>]
 <SkuIdS>         ::=3D <Keyword> [<FS> <Keyword>]*
diff --git a/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md b/3_edk=
_ii_dsc_file_format/33_platform_dsc_definition.md
index 5b1c0d4..313fc20 100644
--- a/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md
+++ b/3_edk_ii_dsc_file_format/33_platform_dsc_definition.md
@@ -1,7 +1,7 @@
 <!--- @file
   3.3 Platform DSC Definition
=20
-  Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
=20
   Redistribution and use in source (original document form) and 'compiled'
   forms (converted to PDF, epub, HTML and other formats) with or without
@@ -192,9 +192,13 @@ The following are common definitions used by multiple =
section types.
 <BoolType>             ::=3D {<BoolVal>} {"{"<BoolVal>"}"}
 <MACRO>                ::=3D (A-Z)(A-Z0-9_)*
 <MACROVAL>             ::=3D "$(" <MACRO> ")"
+<PcdFieldName>         ::=3D <TokenSpaceGuidCName> "." <PcdCName> "." <Fie=
ld>
 <PcdName>              ::=3D <TokenSpaceGuidCName> "." <PcdCName>
 <PcdCName>             ::=3D <CName>
 <TokenSpaceGuidCName>  ::=3D <CName>
+<Field>                ::=3D <CName>
+<PcdFieldEntry>        ::=3D <PcdFieldName> <FS> <PcdFieldValue> <EOL>
+<PcdFieldValue>        ::=3D {<BoolType>} {<NumValUint8>} {<NumValUint16>}=
 {<NumValUint32>} {<NumValUint64>} {<StringVal>} {<MACROVAL>} {<Expression>}
 <PCDVAL>               ::=3D "PCD(" <PcdName> ")"
 <UINT8>                ::=3D {"0x"} {"0X"} (\x0 - \xFF)
 <UINT16>               ::=3D {"0x"} {"0X"} (\x0 - \xFFFF)
--=20
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel