From nobody Thu May 2 20:44:40 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; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 152818396245216.34188277166504; Tue, 5 Jun 2018 00:32:42 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4EFA021161697; Tue, 5 Jun 2018 00:32:41 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 79B462115C319 for ; Tue, 5 Jun 2018 00:32:39 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jun 2018 00:32:38 -0700 Received: from shwde7172.ccr.corp.intel.com ([10.239.158.42]) by fmsmga005.fm.intel.com with ESMTP; 05 Jun 2018 00:32:37 -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=134.134.136.65; helo=mga03.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.49,478,1520924400"; d="scan'208";a="234456734" From: Liming Gao To: edk2-devel@lists.01.org Date: Tue, 5 Jun 2018 15:32:35 +0800 Message-Id: <1528183955-9128-1-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 Subject: [edk2] [Patch] FDF spec: Add the syntax to describe structure pcd usage X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 Cc: Yonghong Zhu Reviewed-by: Yonghong Zhu =20 --- 2_fdf_design_discussion/21_processing_overview.md | 1 + 2_fdf_design_discussion/22_flash_description_file_format.md | 6 +++--- 2_fdf_design_discussion/24_[fd]_sections.md | 5 +++-- 3_edk_ii_fdf_file_format/32_fdf_definition.md | 2 ++ 3_edk_ii_fdf_file_format/35_[fd]_sections.md | 8 ++++---- 3_edk_ii_fdf_file_format/36_[fv]_sections.md | 2 +- 3_edk_ii_fdf_file_format/37_[capsule]_sections.md | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/2_fdf_design_discussion/21_processing_overview.md b/2_fdf_desi= gn_discussion/21_processing_overview.md index 7a045dd..68d70f0 100644 --- a/2_fdf_design_discussion/21_processing_overview.md +++ b/2_fdf_design_discussion/21_processing_overview.md @@ -108,6 +108,7 @@ FDF file. The PCDs used in the FDF file must be specified as: =20 `PcdTokenSpaceGuidCName.PcdCName` +or `PcdTokenSpaceGuidCName.PcdCName.PcdFieldName` =20 ### 2.1.2 Precedence of PCD Values =20 diff --git a/2_fdf_design_discussion/22_flash_description_file_format.md b/= 2_fdf_design_discussion/22_flash_description_file_format.md index 368ce32..f266460 100644 --- a/2_fdf_design_discussion/22_flash_description_file_format.md +++ b/2_fdf_design_discussion/22_flash_description_file_format.md @@ -492,9 +492,9 @@ Unique PCDs are identified using the format to identify= the named PCD: =20 `PcdTokenSpaceGuidCName.PcdCName` =20 -The PCD's Name (`PcdName`) is defined as PCD Token Space Guid C name and t= he -PCD C name - separated by a period "." character. PCD C names are used in C -code and must follow the C variable name rules. +The PCD's Name (`PcdName`) is defined as PCD Token Space Guid C name, the +PCD C name and the optional field name - separated by a period "." charact= er.=20 +PCD C names are used in C code and must follow the C variable name rules. =20 A PCD's values are positional with in the FDF file, and may be set by eith= er the automatic setting grammar defined in this specification, or through `S= ET` diff --git a/2_fdf_design_discussion/24_[fd]_sections.md b/2_fdf_design_dis= cussion/24_[fd]_sections.md index 04053a0..e532041 100644 --- a/2_fdf_design_discussion/24_[fd]_sections.md +++ b/2_fdf_design_discussion/24_[fd]_sections.md @@ -145,10 +145,11 @@ region, so the `SET` statement can occur anywhere wit= hin an FD section. =20 `SET PcdName =3D VALUE` =20 -Additionally, a PCD Name is made up of two parts, separated by a period "." -character. The format for a `PcdName` is: +Additionally, a PCD Name is made up of two parts or three parts, separated=20 +by a period "." character. The format for a `PcdName` is: =20 `PcdTokenSpaceGuidCName.PcdCName` +or `PcdTokenSpaceGuidCName.PcdCName.PcdFieldName` =20 The following is an example of the `SET` statement: =20 diff --git a/3_edk_ii_fdf_file_format/32_fdf_definition.md b/3_edk_ii_fdf_f= ile_format/32_fdf_definition.md index 1379db4..6506a3d 100644 --- a/3_edk_ii_fdf_file_format/32_fdf_definition.md +++ b/3_edk_ii_fdf_file_format/32_fdf_definition.md @@ -174,9 +174,11 @@ The following are common definitions used by multiple = section types. ::=3D {} {} ::=3D (A-Z)(A-Z0-9_)* ::=3D "$(" ")" + ::=3D "." "." ::=3D "." ::=3D ::=3D + ::=3D ::=3D "PCD(" ")" ::=3D {"0x"} {"0X"} (\x0 - \xFF) ::=3D "0x"} {"0X"} (\x0 - \xFFFF) diff --git a/3_edk_ii_fdf_file_format/35_[fd]_sections.md b/3_edk_ii_fdf_fi= le_format/35_[fd]_sections.md index 6c87ebd..f0003e7 100644 --- a/3_edk_ii_fdf_file_format/35_[fd]_sections.md +++ b/3_edk_ii_fdf_file_format/35_[fd]_sections.md @@ -62,11 +62,11 @@ Conditional statements may be used anywhere within this= section. "Size" [] "ErasePolarity" {"0"} {"1"} + - ::=3D + ::=3D {} {} ::=3D "BlockSize" [] [ "NumBlocks" ] - ::=3D "SET" + ::=3D "SET" {} {} ::=3D {} {} {} {} {} {} {} ::=3D @@ -86,8 +86,8 @@ Conditional statements may be used anywhere within this s= ection. ::=3D ".inf" [ ] ::=3D {"RELOCS_STRIPPED"} {"RELOCS_RETAINED"} ::=3D "CAPSULE" UiCapsuleName - ::=3D - ::=3D + ::=3D {} {} + ::=3D {} {} ::=3D "FV" ::=3D "FILE" ::=3D "DATA" diff --git a/3_edk_ii_fdf_file_format/36_[fv]_sections.md b/3_edk_ii_fdf_fi= le_format/36_[fv]_sections.md index b4f292a..633b4a7 100644 --- a/3_edk_ii_fdf_file_format/36_[fv]_sections.md +++ b/3_edk_ii_fdf_file_format/36_[fv]_sections.md @@ -86,7 +86,7 @@ Conditional statements may be used anywhere within this s= ection. ::=3D ::=3D [ "BlockSize" ] [ "NumBlocks" ] - ::=3D "SET" + ::=3D "SET" {} {} ::=3D {} {} {} {} {} {} {} ::=3D [ "FvBaseAddress" ] diff --git a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md b/3_edk_ii_f= df_file_format/37_[capsule]_sections.md index 6606d56..fe8721c 100644 --- a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md +++ b/3_edk_ii_fdf_file_format/37_[capsule]_sections.md @@ -49,7 +49,7 @@ Conditional statements may be used anywhere within this s= ection. * ::=3D "." - ::=3D "SET" + ::=3D "SET" {} {} ::=3D {} {} {} {} {} {} {} ::=3D "CAPSULE_GUID" --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel