* [Patch] FDF Spec: clean up to support <NamedGuidOrPcd> for FILE statement
@ 2018-06-15 7:41 Yonghong Zhu
0 siblings, 0 replies; only message in thread
From: Yonghong Zhu @ 2018-06-15 7:41 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao, Michael Kinney, Kevin W Shaw
Update the format in [FV], [Capsule] and [Rule] section.
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/36_[fv]_sections.md | 8 ++++----
3_edk_ii_fdf_file_format/37_[capsule]_sections.md | 10 +++++-----
3_edk_ii_fdf_file_format/39_[rule]_sections.md | 15 ++++++---------
README.md | 1 +
5 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/2_fdf_design_discussion/26_[capsule]_sections.md b/2_fdf_design_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
- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
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 met:
@@ -71,11 +71,11 @@ extended header entries.
Currently, three bit flags have been defined:
```
PersistAcrossReset = CAPSULE_FLAGS_PERSIST_ACROSS_RESET
-InitiateReset = CAPSULE_FLAGS_INITIATE_RESET and
+InitiateReset = CAPSULE_FLAGS_INITIATE_RESET
PopulateSystemTable = CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE
```
The value of the `EFI_CAPSULE_IMAGE_SIZE`, which is the size in bytes of the
capsule, is determined by the tools.
diff --git a/3_edk_ii_fdf_file_format/36_[fv]_sections.md b/3_edk_ii_fdf_file_format/36_[fv]_sections.md
index b4f292a..47aca25 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
- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
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 met:
@@ -139,15 +139,15 @@ Conditional statements may be used anywhere within this section.
<PATH> <Word> ".inf" [<FS> <RelocFlags>] <EOL> else:
<PATH> <Word> ".inf" <EOL>
<RelocFlags> ::= {"RELOCS_STRIPPED"} {"RELOCS_RETAINED"}
<FileStatements> ::= {<type1>} {<type2>} {<type3>} {<type4>}
{<type5>} <EOL>
-<type1> ::= <TS> "FILE" <MTS> <FvType1> <Eq> <NamedGuid> <Options1>
-<type2> ::= <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuid> <Options2>
+<type1> ::= <TS> "FILE" <MTS> <FvType1> <Eq> <NamedGuidOrPcd> <Options1>
+<type2> ::= <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuidOrPcd> <Options2>
<type3> ::= <TS> "FILE" <MTS> "RAW" <Eq> <NamedGuidOrPcd>
<Options2>
-<type4> ::= <TS> "FILE" <MTS> "NON_FFS_FILE" <Eq> [<NamedGuid>]
+<type4> ::= <TS> "FILE" <MTS> "NON_FFS_FILE" <Eq> [<NamedGuidOrPcd>]
<Options2>
<type5> ::= <TS> "FILE" <MTS> "FV_IMAGE" <Eq>
<NamedGuidOrPcd> <Options2>
<FvType1> ::= {"SEC"} {"PEI_CORE"} {"PEIM"}
<FvType2> ::= {"FREEFORM"} {"PEI_DXE_COMBO"} {"DRIVER"}
diff --git a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md b/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
index 6606d56..621bd1f 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
- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
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 met:
@@ -101,21 +101,21 @@ Conditional statements may be used anywhere within this section.
<RelocFlags> ::= {"RELOCS_STRIPPED"} {"RELOCS_RETAINED"}
<KeyString> ::= <Target> "_" <TagName> "_" <TargetArch>
<Target> ::= {Target} {"$(TARGET)"}
<TagName> ::= {TagName} {"$(TOOL_CHAIN_TAG)"}
<FileStatements> ::= <TS> {<type1>} {<type2>} {<type3>} {<type4>}
-<type1> ::= "FILE" <FvType1> <Eq> <NamedGuid> <Options1>
-<type2> ::= "FILE" <FvType2> <Eq> <NamedGuid> <Options2>
+<type1> ::= "FILE" <FvType1> <Eq> <NamedGuidOrPcd> <Options1>
+<type2> ::= "FILE" <FvType2> <Eq> <NamedGuidOrPcd> <Options2>
<type3> ::= "FILE" "RAW" <Eq> <NamedGuidOrPcd>
<Options2>
-<type4> ::= "FILE" "NON_FFS_FILE" <Eq> [<NamedGuid>] <Options2>
+<type4> ::= "FILE" "NON_FFS_FILE" <Eq> [<NamedGuidOrPcd>] <Options2>
<type5> ::= "FILE" "FV_IMAGE" <Eq> <NamedGuidOrPcd>
<Options2>
<FvType1> ::= {"SEC"} {"PEI_CORE"} {"PEIM"}
<FvType2> ::= {"FREEFORM"} {"PEI_DXE_COMBO"} {"DRIVER"}
{"DXE_CORE"} {"APPLICATION"} {"SMM_CORE"} {"SMM"}
-<NamedGuid> ::= {<RegistryFormatGUID>} {"$(NAMED_GUID)"}
+<NamedGuid> ::= {<RegistryFormatGUID>} {"$(NAMED_GUID)"} {<GuidCName>}
<NamedGuidOrPcd> ::= {<NamedGuid>} {"PCD(" <PcdName> ")"}
<Options1> ::= [<Use>] [<FileOpts>] [<RelocFlags>]
"{" [<EOL>]
<TS> {<Filename>} {<SectionData>} [<EOL>] <TS> "}"
<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..2655915 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
- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
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 met:
@@ -96,23 +96,20 @@ Conditional statements may be used anywhere within this section.
|| COMPONENT_TYPE == "APPLICATION"):
{<FileStatement2>} {<FileStatement3>}
elif (MODULE_TYPE == "FV_IMAGE"):
<FileStatement4> else:
<TS> "FILE" <MTS> "NON_FFS_FILE" <Eq>
- [<NamedGuid>] [<Options>] <EOL>
-<FileStatement1> ::= <NamedGuid> [<RelocFlags> <MTS>] [<Options>] <EOL>
-<FileStatement2> ::= <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuid>
+ [<NamedGuidOrPcd>] [<Options>] <EOL>
+<FileStatement1> ::= <NamedGuidOrPcd> [<RelocFlags> <MTS>] [<Options>] <EOL>
+<FileStatement2> ::= <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuidOrPcd>
[<Options>] <EOL>
<FileStatement3> ::= <TS> "FILE" <MTS> "RAW" <Eq> <NamedGuidOrPcd>
[<Options>] <EOL>
<FileStatement4> ::= <TS> "FILE" <MTS> "FV_IMAGE" <Eq>
<NamedGuidOrPcd> [<Options>] <EOL>
-<NamedGuid> ::= {"$(NAMED_GUID)"} {<RegistryFormatGUID>}
- {<Sym>} <MTS>
-<Sym> ::= "$(" <Word> ")"
-<NamedGuidOrPcd> ::= <NamedGuid> <MTS>
- {"PCD(" <PcdName> ")"} {<GuidValue>} <MTS>
+<NamedGuid> ::= {<RegistryFormatGUID>} {"$(NAMED_GUID)"} {<GuidCName>}
+<NamedGuidOrPcd> ::= {<NamedGuid>} {"PCD(" <PcdName> ")"}
<GuidValue> ::= {<GuidCName>} {<GuidStructure>}
<GuidCName> ::= <CName>
<GuidStructure> ::= {<RegistryFormatGUID>} {<CFormatGUID>}
<FvType1> ::= {"SEC"} {"PEI_CORE"} {"PEIM"} {"PEI_DXE_COMBO"}
<FvType2> ::= {"FREEFORM"} {"DRIVER"} {"DXE_CORE"}
diff --git a/README.md b/README.md
index 042e2ca..b52bdc1 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=585) 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 to support <NamedGuidOrPcd> for FILE statement | |
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-06-15 7:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-15 7:41 [Patch] FDF Spec: clean up to support <NamedGuidOrPcd> for FILE statement Yonghong Zhu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox