From nobody Fri May  3 08:50:17 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: <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 1529395961317331.35673606897615;
 Tue, 19 Jun 2018 01:12:41 -0700 (PDT)
Received: from [127.0.0.1] (localhost [IPv6:::1])
	by ml01.01.org (Postfix) with ESMTP id 8147A211299BA;
	Tue, 19 Jun 2018 01:12:40 -0700 (PDT)
Received: from mga06.intel.com (mga06.intel.com [134.134.136.31])
 (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 1C53A21104F98
 for <edk2-devel@lists.01.org>; Tue, 19 Jun 2018 01:12:39 -0700 (PDT)
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
 by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 19 Jun 2018 01:12:38 -0700
Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129])
 by fmsmga006.fm.intel.com with ESMTP; 19 Jun 2018 01:12:29 -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.31; helo=mga06.intel.com;
 envelope-from=yonghong.zhu@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.51,242,1526367600"; d="scan'208";a="238672198"
From: Yonghong Zhu <yonghong.zhu@intel.com>
To: edk2-devel@lists.01.org
Date: Tue, 19 Jun 2018 16:12:27 +0800
Message-Id: <1529395947-23044-1-git-send-email-yonghong.zhu@intel.com>
X-Mailer: git-send-email 2.6.1.windows.1
Subject: [edk2] [Patch] FDF Spec: clean up the <NamedGuidOrPcd> and
 <NamedGuid> usage in spec
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.26
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>,
 Kevin W Shaw <kevin.w.shaw@intel.com>, Liming Gao <liming.gao@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"

<NamedGuidOrPcd>::=3D {"PCD(" <PcdName> ")"} {<RegistryFormatGUID>} {<GuidC=
Name>}
<NamedGuid>     ::=3D {<NamedGuidOrPcd>} {"$(NAMED_GUID)"}

Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 2_fdf_design_discussion/26_[capsule]_sections.md   |  4 +--
 3_edk_ii_fdf_file_format/32_fdf_definition.md      |  5 ++++
 3_edk_ii_fdf_file_format/36_[fv]_sections.md       | 23 ++++++-----------
 3_edk_ii_fdf_file_format/37_[capsule]_sections.md  | 29 ++++++++----------=
----
 .../38_[fmppayload]_sections.md                    |  4 +--
 3_edk_ii_fdf_file_format/39_[rule]_sections.md     | 21 ++++++----------
 README.md                                          |  1 +
 7 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/2_fdf_design_discussion/26_[capsule]_sections.md b/2_fdf_desig=
n_discussion/26_[capsule]_sections.md
index ba93268..2e29612 100644
--- a/2_fdf_design_discussion/26_[capsule]_sections.md
+++ b/2_fdf_design_discussion/26_[capsule]_sections.md
@@ -1,9 +1,9 @@
 <!--- @file
   2.6 [Capsule] Sections
=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
   modification, are permitted provided that the following conditions are m=
et:
=20
@@ -71,11 +71,11 @@ extended header entries.
=20
 Currently, three bit flags have been defined:
=20
 ```
 PersistAcrossReset  =3D CAPSULE_FLAGS_PERSIST_ACROSS_RESET
-InitiateReset       =3D CAPSULE_FLAGS_INITIATE_RESET and
+InitiateReset       =3D CAPSULE_FLAGS_INITIATE_RESET
 PopulateSystemTable =3D CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE
 ```
=20
 The value of the `EFI_CAPSULE_IMAGE_SIZE`, which is the size in bytes of t=
he
 capsule, is determined by the tools.
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 a097751..bcefda6 100644
--- a/3_edk_ii_fdf_file_format/32_fdf_definition.md
+++ b/3_edk_ii_fdf_file_format/32_fdf_definition.md
@@ -136,10 +136,11 @@ The following are common definitions used by multiple=
 section types.
 <Major>                ::=3D <HexDigit>? <HexDigit>? <HexDigit>?
                            <HexDigit>
 <Minor>                ::=3D <HexDigit> <HexDigit> <HexDigit> <HexDigit>
 <DecimalVersion>       ::=3D {"0"} {(1-9) [(0-9)]*} ["." (0-9)+]
 <VersionVal>           ::=3D {<HexVersion>} {(0-9)+ "." (0-99)}
+<NamedGuidOrPcd>       ::=3D {"PCD(" <PcdName> ")"} {<RegistryFormatGUID>}=
 {<GuidCName>}
 <GUID>                 ::=3D {<RegistryFormatGUID>} {<CFormatGUID>}
 <RegistryFormatGUID>   ::=3D <RHex8> "-" <RHex4> "-" <RHex4> "-" <RHex4> "=
-"
                            <RHex12>
 <RHex4>                ::=3D <HexDigit> <HexDigit> <HexDigit> <HexDigit>
 <RHex8>                ::=3D <RHex4> <RHex4>
@@ -172,10 +173,11 @@ The following are common definitions used by multiple=
 section types.
                            {"0x01"} {"1"}
 <FALSE>                ::=3D {"FALSE"} {"false"} {"False"} {"0x0"} {"0x00"=
} {"0"}
 <BoolType>             ::=3D {<TRUE>} {<FALSE>}
 <MACRO>                ::=3D (A-Z)(A-Z0-9_)*
 <MACROVAL>             ::=3D "$(" <MACRO> ")"
+<GuidCName>            ::=3D <CName>
 <PcdName>              ::=3D <TokenSpaceGuidCName> "." <PcdCName>
 <PcdCName>             ::=3D <CName>
 <TokenSpaceGuidCName>  ::=3D <CName>
 <PCDVAL>               ::=3D "PCD(" <PcdName> ")"
 <UINT8>                ::=3D {"0x"} {"0X"} (\x0 - \xFF)
@@ -238,10 +240,13 @@ expression must be encapsulated in open "(" and close=
 ")" parenthesis.
 **********
 **Note:** Comments may appear anywhere within a FDF file, provided they fo=
llow
 the rules that a comment may not be enclosed within Section headers, and t=
hat
 in line comments must appear at the end of a statement.
 **********
+**Note:** The PCD item used in `<NamedGuidOrPcd>` must be defined as Fixed=
AtBuild
+type and VOID* datum type, and the size of the PCD must be 16 bytes.
+**********
=20
 ### Parameter Definitions
=20
 **_Expression_**
=20
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..c68e2dd 100644
--- a/3_edk_ii_fdf_file_format/36_[fv]_sections.md
+++ b/3_edk_ii_fdf_file_format/36_[fv]_sections.md
@@ -1,9 +1,9 @@
 <!--- @file
   3.6 [FV] Sections
=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
   modification, are permitted provided that the following conditions are m=
et:
=20
@@ -107,12 +107,12 @@ Conditional statements may be used anywhere within th=
is section.
                         [<TS> "READ_LOCK_STATUS" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_ENABLED_CAP" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_DISABLED_CAP" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_STATUS" <Eq> <TrueFalse> <EOL>]
                         [<TS> "ERASE_POLARITY" <Eq> {"0"} {"1"} <EOL>]
-<FileSystemGuid>    ::=3D <TS> "FileSystemGuid" <Eq> <NamedGuid> <EOL>
-<FvNameGuid>        ::=3D <TS> "FvNameGuid" <Eq> <NamedGuid> <EOL>
+<FileSystemGuid>    ::=3D <TS> "FileSystemGuid" <Eq> <NamedGuidOrPcd> <EOL>
+<FvNameGuid>        ::=3D <TS> "FvNameGuid" <Eq> <NamedGuidOrPcd> <EOL>
 <FvUsedSize>        ::=3D <TS> "FvUsedSizeEnable" <Eq> <TrueFalse> <EOL>
 <FvNameString>      ::=3D <TS> "FvNameString" <Eq> <TrueFalse> <EOL>
 <PeiAprioriSection> ::=3D <TS> "APRIORI" <MTS> "PEI" <MTS>
                         "{" <EOL>
                         <MacroDefinition>*
@@ -139,23 +139,21 @@ Conditional statements may be used anywhere within th=
is section.
                         <PATH> <Word> ".inf" [<FS> <RelocFlags>] <EOL> els=
e:
                         <PATH> <Word> ".inf" <EOL>
 <RelocFlags>        ::=3D {"RELOCS_STRIPPED"} {"RELOCS_RETAINED"}
 <FileStatements>    ::=3D {<type1>} {<type2>} {<type3>} {<type4>}
                         {<type5>} <EOL>
-<type1>             ::=3D <TS> "FILE" <MTS> <FvType1> <Eq> <NamedGuid> <Op=
tions1>
-<type2>             ::=3D <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuid> <Op=
tions2>
+<type1>             ::=3D <TS> "FILE" <MTS> <FvType1> <Eq> <NamedGuidOrPcd=
> <Options1>
+<type2>             ::=3D <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuidOrPcd=
> <Options2>
 <type3>             ::=3D <TS> "FILE" <MTS> "RAW" <Eq> <NamedGuidOrPcd>
                         <Options2>
-<type4>             ::=3D <TS> "FILE" <MTS> "NON_FFS_FILE" <Eq> [<NamedGui=
d>]
+<type4>             ::=3D <TS> "FILE" <MTS> "NON_FFS_FILE" <Eq> [<NamedGui=
dOrPcd>]
                         <Options2>
 <type5>             ::=3D <TS> "FILE" <MTS> "FV_IMAGE" <Eq>
                         <NamedGuidOrPcd> <Options2>
 <FvType1>           ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"}
 <FvType2>           ::=3D {"FREEFORM"} {"PEI_DXE_COMBO"} {"DRIVER"}
                         {"DXE_CORE"} {"APPLICATION"} {"SMM_CORE"} {"SMM"}
-<NamedGuidOrPcd>    ::=3D {<NamedGuid>} {"PCD(" <PcdName> ")"}
-<NamedGuid>         ::=3D {<RegistryFormatGUID>} {"$(NAMED_GUID)"} {<GuidC=
Name>}
 <Options1>          ::=3D [<Use>] [<FileOpts>] <RelocFlags> <MTS>
                         "{" [<EOL>]
                         {<Filename>} {<SectionData>} <TS> <TS> "}" [<EOL>]
 <Options2>          ::=3D [<Use>] [<FileOpts>] <MTS>
                         "{" [<EOL>]
@@ -204,11 +202,11 @@ Conditional statements may be used anywhere within th=
is section.
                         <SectionOrFile>
 <LeafSecType>       ::=3D {"COMPAT16"} {"PE32"} {"PIC"} {"TE"} {"RAW"}
                         {"FV_IMAGE"} {"DXE_DEPEX"} {"SMM_DEPEX"}
                         {"UI"} {"PEI_DEPEX"} {"VERSION"}
 <SubTypeGuid>       ::=3D <TS> "SECTION" <MTS> [<FfsAlignment>] <STG_Data>
-<STG_Data>          ::=3D "SUBTYPE_GUID" <MTS> <GuidValue> <Eq>
+<STG_Data>          ::=3D "SUBTYPE_GUID" <MTS> <NamedGuidOrPcd> <Eq>
                         <NormalFile> <EOL>
 <ChkReloc>          ::=3D if ((LeafSectionType =3D=3D "PE32"
                         || LeafSectionType =3D=3D "TE")
                         && (MODULE_TYPE =3D=3D "SEC"
                         || MODULE_TYPE =3D=3D "PEI_CORE"
@@ -221,11 +219,11 @@ Conditional statements may be used anywhere within th=
is section.
                         "{" <EOL>
                         <EncapSec>*
                         <LeafSections>*
                         <TS> "}" [<EOL>]
 <CompType>          ::=3D {"PI_STD"} {"PI_NONE"} <MTS>
-<GuidedSection>     ::=3D "GUIDED" <MTS> <NamedGuid> <MTS>
+<GuidedSection>     ::=3D "GUIDED" <MTS> <NamedGuidOrPcd> <MTS>
                         [<GuidedOptions>]
                         "{" <EOL>
                         <EncapSec>*
                         <LeafSections>*
                         <TS> "}" [<EOL>]
@@ -263,11 +261,10 @@ Conditional statements may be used anywhere within th=
is section.
                         [<TS> <DepInstruct> {<EOL>} {<MTS>}]
                         [<TS> "end" {<EOL>} {<MTS>}]
 <BoolStmt>          ::=3D {<Bool>} {<BoolExpress>}
                         {<GuidCName>} {<EOL>} {<MTS>}
 <Bool>              ::=3D {"TRUE"} {"FALSE"} {<GuidCName>}
-<GuidCName>         ::=3D <CName> # A Guid C Name
 <BoolExpress>       ::=3D [<Not>] <GuidCName> [<OP> [<Not>] <GuidCName> ]*
 <Not>               ::=3D "NOT" <MTS>
 <OP>                ::=3D <MTS> {"AND"} {"OR"} <MTS>
 <DepInstruct>       ::=3D "push" <MTS> <Filename>
 <DxeDepexExp>       ::=3D <TS> "SECTION" <MTS> [<FfsAlignment>] "DXE_DEPEX=
_EXP"
@@ -315,14 +312,10 @@ This is short hand notation refering to content that =
will be placed in a
 Section of type: EFI_SECTION_FREEFORM_SUBTYPE_GUID. A single
=20
 `EFI_SECTION_FREEFORM_SUBTYPE_GUID` section is permitted in an FFS File of=
 type
 `EFI_FV_FILETYPE_FREEFORM`
=20
-**_GuidCName_**
-
-A word that is a valid C variable for a GUID.
-
 **_Expression_**
=20
 Refer to the EDK II Expression Syntax Specification for more information.
=20
 **_COMPRESS_**
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..2871a32 100644
--- a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
+++ b/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
@@ -1,9 +1,9 @@
 <!--- @file
   3.7 [Capsule] Sections
=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
   modification, are permitted provided that the following conditions are m=
et:
=20
@@ -50,19 +50,16 @@ Conditional statements may be used anywhere within this=
 section.
                         <CapsuleStmts>*
 <UiCapsuleName>     ::=3D "." <Word>
 <SetStatements>     ::=3D <TS> "SET" <MTS> <PcdName> <Eq> <VALUE> <EOL>
 <VALUE>             ::=3D {<Number>} {<Boolean>} {<GUID>} {<CArray>}
                         {<CString>} {<UnicodeString>} {<Expression>}
-<UefiTokens>        ::=3D <TS> "CAPSULE_GUID" <Eq> <GuidValue> <EOL>
+<UefiTokens>        ::=3D <TS> "CAPSULE_GUID" <Eq> <NamedGuidOrPcd> <EOL>
                         [<TS> "CAPSULE_HEADER_SIZE" <Eq> <Bytes> <EOL>] [<=
TS>
                         "CAPSULE_FLAGS" <Eq> <Flags> <EOL>]
                         [<TS> "CAPSULE_HEADER_INIT_VERSION" <Eq> <Hex2> <E=
OL>]
 <CapsuleStmts>      ::=3D {<MacroDefinition>} {<SetStatements>}
                         {<CapsuleData>}
-<GuidValue>         ::=3D {<GuidCName>} {<GuidStructure>}
-<GuidCName>         ::=3D <CName>
-<GuidStructure>     ::=3D {<RegistryFormatGUID>} {<CFormatGUID>}
 <Flags>             ::=3D <FlagName>
 <FlagName>          ::=3D {"PersistAcrossReset"}
                         {"PersistAcrossReset" "," "InitiateReset"}
                         {"PersistAcrossReset" "," "PopulateSystemTable"}
                         {"PersistAcrossReset" "," "PopulateSystemTable"
@@ -101,22 +98,20 @@ Conditional statements may be used anywhere within thi=
s section.
 <RelocFlags>        ::=3D {"RELOCS_STRIPPED"} {"RELOCS_RETAINED"}
 <KeyString>         ::=3D <Target> "_" <TagName> "_" <TargetArch>
 <Target>            ::=3D {Target} {"$(TARGET)"}
 <TagName>           ::=3D {TagName} {"$(TOOL_CHAIN_TAG)"}
 <FileStatements>    ::=3D <TS> {<type1>} {<type2>} {<type3>} {<type4>}
-<type1>             ::=3D "FILE" <FvType1> <Eq> <NamedGuid> <Options1>
-<type2>             ::=3D "FILE" <FvType2> <Eq> <NamedGuid> <Options2>
+<type1>             ::=3D "FILE" <FvType1> <Eq> <NamedGuidOrPcd> <Options1>
+<type2>             ::=3D "FILE" <FvType2> <Eq> <NamedGuidOrPcd> <Options2>
 <type3>             ::=3D "FILE" "RAW" <Eq> <NamedGuidOrPcd>
                         <Options2>
-<type4>             ::=3D "FILE" "NON_FFS_FILE" <Eq> [<NamedGuid>] <Option=
s2>
+<type4>             ::=3D "FILE" "NON_FFS_FILE" <Eq> [<NamedGuidOrPcd>] <O=
ptions2>
 <type5>             ::=3D "FILE" "FV_IMAGE" <Eq> <NamedGuidOrPcd>
                         <Options2>
 <FvType1>           ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"}
 <FvType2>           ::=3D {"FREEFORM"} {"PEI_DXE_COMBO"} {"DRIVER"}
                         {"DXE_CORE"} {"APPLICATION"} {"SMM_CORE"} {"SMM"}
-<NamedGuid>         ::=3D {<RegistryFormatGUID>} {"$(NAMED_GUID)"}
-<NamedGuidOrPcd>    ::=3D {<NamedGuid>} {"PCD(" <PcdName> ")"}
 <Options1>          ::=3D [<Use>] [<FileOpts>] [<RelocFlags>]
                         "{" [<EOL>]
                         <TS> {<Filename>} {<SectionData>} [<EOL>] <TS> "}"
                         <EOL>
 <Options2>          ::=3D [<Use>] [<FileOpts>]
@@ -197,15 +192,12 @@ Conditional statements may be used anywhere within th=
is section.
 <SecData>           ::=3D <LeafSecType> [<ChkReloc>] <SectionOrFile>
 <LeafSecType>       ::=3D {"COMPAT16"} {"PE32"} {"PIC"} {"TE"} {"RAW"}
                         {"FV_IMAGE"} {"DXE_DEPEX"} {"SMM_DEPEX"}
                         {"UI"} {"PEI_DEPEX"} {"VERSION"}
 <SubTypeGuid>       ::=3D <TS> "SECTION" <MTS> [<FfsAlignment>] <SgData>
-<SgData>            ::=3D "SUBTYPE_GUID" <MTS> <GuidValue> <Eq>
+<SgData>            ::=3D "SUBTYPE_GUID" <MTS> <NamedGuidOrPcd> <Eq>
                         <NormalFile> <EOL>
-<GuidValue>         ::=3D {<GuidCName>} {<GuidStructure>}
-<GuidCName>         ::=3D <CName>
-<GuidStructure>     ::=3D {<RegistryFormatGUID>} {<CFormatGUID>}
 <ChkReloc>          ::=3D if ((LeafSecType =3D=3D "PE32"
                         || LeafSecType =3D=3D "TE")
                         && (MODULE_TYPE =3D=3D "SEC"
                         || MODULE_TYPE =3D=3D "PEI_CORE"
                         || MODULE_TYPE =3D=3D "PEIM")): [<RelocFlags>]
@@ -219,11 +211,11 @@ Conditional statements may be used anywhere within th=
is section.
                         [<DxeAprioriSection>]
                         <EncapSec>*
                         <LeafSections>*
                         <TS> "}" <EOL>
 <CompType>          ::=3D {"PI_STD"} {"PI_NONE"} <MTS>
-<GuidedSection>     ::=3D "GUIDED" <NamedGuid> [<GuidedOptions>]
+<GuidedSection>     ::=3D "GUIDED" <NamedGuidOrPcd> [<GuidedOptions>]
                         "{" <EOL>
                         <MacroDefinition>*
                         [<PeiAprioriSection>]
                         [<DxeAprioriSection>]
                         <EncapSec>*
@@ -254,11 +246,11 @@ Conditional statements may be used anywhere within th=
is section.
                         [<TS> "READ_LOCK_CAP" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_LOCK_STATUS" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_ENABLED_CAP" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_DISABLED_CAP" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_STATUS" <Eq> <TrueFalse> <EOL>]
-<FileSystemGuid>    ::=3D "FileSystemGuid" <Eq> <NamedGuid>
+<FileSystemGuid>    ::=3D "FileSystemGuid" <Eq> <NamedGuidOrPcd>
 <DepexExpSection>   ::=3D if ( COMPONENT_TYPE =3D=3D "LIBRARY"
                         || LIBRARY_CLASS is declared in defines section of=
 the
                         INF
                         || MODULE_TYPE =3D=3D "USER_DEFINED" ):
                         [<Depex>]
@@ -286,11 +278,10 @@ Conditional statements may be used anywhere within th=
is section.
                         [<DepInstruct> {<EOL>} {<MTS>}]*
                         ["end"] [<EOL>]
 <BoolStmt>          ::=3D {<Boolean>} {<BoolExpress>}
                         {<GuidCName>} <EOL>
 <Boolean>           ::=3D {"TRUE"} {"FALSE"} {<GuidCName>}
-<GuidCName>         ::=3D <CName> # A Guid C Name
 <BoolExpress>       ::=3D <GuidCName> [<OP> ["NOT"] <GuidCName> ]*
 <OP>                ::=3D <MTS> {"AND"} {"OR"} <MTS>
 <DepInstruct>       ::=3D "push" <Filename>
 <DxeDepexExp>       ::=3D "SECTION" <MTS> [<FfsAlignment>] <DxeExp>
 <DxeExp>            ::=3D "DXE_DEPEX_EXP" <Eq> <MTS>
@@ -321,14 +312,14 @@ environment variable.
=20
 **_TargetArch_**
=20
 Only specific architectures are permitted - use of "common" is prohibited.
=20
-**_GuidValue_**
+**_NamedGuidOrPcd_**
=20
 When specifying the CAPSULE_GUID value for an FMP Capsule, the GUID value =
must
-be set to 6dcbd5ed-e82d-4c44-bda1-7194199ad92a.
+be same as 6dcbd5ed-e82d-4c44-bda1-7194199ad92a.
=20
 #### Parameters
=20
 **_UiCapsuleName_**
=20
diff --git a/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md b/3_edk_i=
i_fdf_file_format/38_[fmppayload]_sections.md
index dceb77d..494122b 100644
--- a/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
+++ b/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
@@ -47,15 +47,15 @@ statement, if present, provides the information for Ven=
dorCode in an
 <FmpPayload>       ::=3D "[FmpPayload" "." <UiFmpName> "]" <EOL>
                        <FmpTokens>
                        <FmpFileData>{1,2}
 <UiFmpName>        ::=3D <Word>
 <FmpTokens>        ::=3D [<TS> "IMAGE_HEADER_INIT_VERSION" <Eq> <Hex2> <EO=
L>]
-                       <TS> "IMAGE_TYPE_ID" <Eq> <RegistryFormatGUID> <EOL>
+                       <TS> "IMAGE_TYPE_ID" <Eq> <NamedGuidOrPcd> <EOL>
                        [<TS> "IMAGE_INDEX" <Eq> <Hex2> <EOL>]
                        [<TS> "HARDWARE_INSTANCE" <Eq> <Hex2> <EOL>]
                        [<TS> "MONOTONIC_COUNT"<Eq> <NumValUint64> <EOL>]
-                       [<TS> "CERTIFICATE_GUID"<Eq> <RegistryFormatGUID><E=
OL>]
+                       [<TS> "CERTIFICATE_GUID"<Eq> <NamedGuidOrPcd><EOL>]
 <FmpFileData>      ::=3D <FileStatements>*
                        <FvStatements>*
                        <FdStatenents>*
 <FileStatements>   ::=3D <TS> "FILE" <Space> "DATA" <Eq> <Filename> <EOL>
 <FvStatements>     ::=3D "FV" <Eq> <FvNameOrFilename> <EOL>
diff --git a/3_edk_ii_fdf_file_format/39_[rule]_sections.md b/3_edk_ii_fdf_=
file_format/39_[rule]_sections.md
index d9f974a..0c2cd1e 100644
--- a/3_edk_ii_fdf_file_format/39_[rule]_sections.md
+++ b/3_edk_ii_fdf_file_format/39_[rule]_sections.md
@@ -1,9 +1,9 @@
 <!--- @file
   3.9 [Rule] Sections
=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
   modification, are permitted provided that the following conditions are m=
et:
=20
@@ -100,22 +100,15 @@ Conditional statements may be used anywhere within th=
is section.
                         <TS> "FILE" <MTS> "NON_FFS_FILE" <Eq>
                         [<NamedGuid>] [<Options>] <EOL>
 <FileStatement1>    ::=3D <NamedGuid> [<RelocFlags> <MTS>] [<Options>] <EO=
L>
 <FileStatement2>    ::=3D <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuid>
                         [<Options>] <EOL>
-<FileStatement3>    ::=3D <TS> "FILE" <MTS> "RAW" <Eq> <NamedGuidOrPcd>
+<FileStatement3>    ::=3D <TS> "FILE" <MTS> "RAW" <Eq> <NamedGuid>
                         [<Options>] <EOL>
 <FileStatement4>    ::=3D <TS> "FILE" <MTS> "FV_IMAGE" <Eq>
-                        <NamedGuidOrPcd> [<Options>] <EOL>
-<NamedGuid>         ::=3D {"$(NAMED_GUID)"} {<RegistryFormatGUID>}
-                        {<Sym>} <MTS>
-<Sym>               ::=3D "$(" <Word> ")"
-<NamedGuidOrPcd>    ::=3D <NamedGuid> <MTS>
-                        {"PCD(" <PcdName> ")"} {<GuidValue>} <MTS>
-<GuidValue>         ::=3D {<GuidCName>} {<GuidStructure>}
-<GuidCName>         ::=3D <CName>
-<GuidStructure>     ::=3D {<RegistryFormatGUID>} {<CFormatGUID>}
+                        <NamedGuid> [<Options>] <EOL>
+<NamedGuid>         ::=3D {<NamedGuidOrPcd>} {"$(NAMED_GUID)"}
 <FvType1>           ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"} {"PEI_DXE_COMBO"}
 <FvType2>           ::=3D {"FREEFORM"} {"DRIVER"} {"DXE_CORE"}
                         {"APPLICATION"} {"SMM_CORE"} {"SMM"}
 <RelocFlags>        ::=3D {"RELOCS_STRIPPED" <MTS>}
                         {"RELOCS_RETAINED" <MTS>}
@@ -131,11 +124,11 @@ Conditional statements may be used anywhere within th=
is section.
 <FileSpec>          ::=3D {<SimpleFile>} {<ComplexFile>} {<SbtGuid>}
 <SimpleFile>        ::=3D <LeafSecType> [<FileOpts>] <VarFile> <EOL>
 <LeafSecType>       ::=3D {"COMPAT16"} {"PE32"} {"PIC"} {"TE"}
                         {"FV_IMAGE"} {"RAW"} {"DXE_DEPEX"} {"UI"}
                         {"PEI_DEPEX"} {"SMM_DEPEX"} {"VERSION"}
-<SbtGuid>           ::=3D "SUBTYPE_GUID" <MTS> <GuidValue> <MTS> <FName> <=
EOL>
+<SbtGuid>           ::=3D "SUBTYPE_GUID" <MTS> <NamedGuid> <MTS> <FName> <=
EOL>
 <VarFile>           ::=3D {<FilenameVariable>} {<FName>} {<Ext>}
 <FName>             ::=3D [<PATH>] <Word> "." <Word>
 <FilenameVariable>  ::=3D "$(INF_OUTPUT)/$(MODULE_NAME)" "." <Word>
 <ComplexFile>       ::=3D "{" <EOL>
                         <EncapSection>*
@@ -146,11 +139,11 @@ Conditional statements may be used anywhere within th=
is section.
                         "{" [<EOL>]
                         <EncapSec>*
                         <LeafSections> <EOL>*
                         <TS> "}" <EOL>
 <CompType>          ::=3D {"PI_STD"} {"PI_NONE"} <MTS>
-<GuidedSection>     ::=3D "GUIDED" <MTS> "$(NAMED_GUID)" <MTS> [<GAttr>]
+<GuidedSection>     ::=3D "GUIDED" <MTS> <NamedGuid> <MTS> [<GAttr>]
                         "{" <EOL>
                         <EncapSec>*
                         <LeafSections>*
                         <TS> "}" <EOL>
 <GAttr>             ::=3D [<GuidAttrPR>] [<GuidAttrASV>] [<GuidHeaderSize>]
@@ -170,11 +163,11 @@ Conditional statements may be used anywhere within th=
is section.
 <SmmDepSec>         ::=3D "SMM_DEPEX" <MTS> <DdFileType> [<FileOrExt>] <EO=
L>
 <UiSec>             ::=3D "UI" <MTS> <UiFileType> [<FileOrExt>] <EOL>
 <VerSec>            ::=3D "VERSION" <MTS> <VerFileType> [<FileOrExt>] <EOL>
 <PeiDepSec>         ::=3D "PEI_DEPEX" <MTS> <PdFileType>
                         [<FileOrExt>] <EOL>
-<SubtypeGuidSec>    ::=3D "SUBTYPE_GUID" <MTS> <GuidValue> <MTS>
+<SubtypeGuidSec>    ::=3D "SUBTYPE_GUID" <MTS> <NamedGuid> <MTS>
                         <File> <EOL>
 <FileOrExt>         ::=3D {<VarFile>} {<Ext>} <MTS>
 <FileOrExtOrPcd>    ::=3D {<VarFile>} {<Ext>} {"PCD(" <PcdName> ")"}
 <Ext>               ::=3D <FS> "." [a-zA-Z][a-zA-Z0-9]{0,}
 <C16FileType>       ::=3D "COMPAT16" [<FfsAlignment>]
diff --git a/README.md b/README.md
index 042e2ca..c2767fb 100644
--- a/README.md
+++ b/README.md
@@ -210,5 +210,6 @@ Copyright (c) 2006-2017, Intel Corporation. All rights =
reserved.
 |            | [#585](https://bugzilla.tianocore.org/show_bug.cgi?id=3D585=
) FDF Spec: Update the FDF_SPECIFICATION version to 0x0001001B or 1.27     =
                                       |               |
 | 1.28       | Update version to 1.28                                     =
                                                                           =
                                     | March 2018    |
 |            | Per PI 1.6 to extend FFS alignment to 16M                  =
                                                                           =
                                     |               |
 |            | Per PI 1.6 to support FV extended header entry contain the =
used size of FV                                                            =
                                     |               |
 |            | Add !error statement section                               =
                                                                           =
                                     |               |
+|            | clean up the <NamedGuidOrPcd> and <NamedGuid> usage in spec=
                                                                           =
                                     |               |
--=20
2.6.1.windows.1

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