[Patch V2] FDF Spec: support varstore template generation with a [FV] section

[Yonghong Zhu <yonghong.zhu@intel.com>]

Add format to support varstore template generation with a dedicated
[FV] section.

Code bug: https://bugzilla.tianocore.org/show_bug.cgi?id=932

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>
---
 3_edk_ii_fdf_file_format/36_[fv]_sections.md | 13 +++++++++++++
 README.md                                    |  1 +
 2 files changed, 14 insertions(+)

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 9c77df9..7796c37 100644
--- a/3_edk_ii_fdf_file_format/36_[fv]_sections.md
+++ b/3_edk_ii_fdf_file_format/36_[fv]_sections.md
@@ -73,10 +73,14 @@ Conditional statements may be used anywhere within this section.
 <BinaryFile>        ::= <PATH> <File> [<EOL>]
 <FvStatements>      ::= [<BlockStatements>]
                         [<FvAlignment>]
                         [<FvAttributes>]
                         [<FileSystemGuid>]
+                        [<VariableSignatureGuid>]
+                        [<VariabeRegionSize>]
+                        [<FtwWorkingSpaceSize>]
+                        [<FtwSpareSpaceSize>]
                         [<FvNameGuid>]
                         [<FvUsedSize>]
                         [<FvNameString>]
                         [<PeiAprioriSection>]
                         [<DxeAprioriSection>]
@@ -109,10 +113,14 @@ Conditional statements may be used anywhere within this section.
                         [<TS> "READ_DISABLED_CAP" <Eq> <TrueFalse> <EOL>]
                         [<TS> "READ_STATUS" <Eq> <TrueFalse> <EOL>]
                         [<TS> "WEAK_ALIGNMENT" <Eq> <TrueFalse> <EOL>]
                         [<TS> "ERASE_POLARITY" <Eq> {"0"} {"1"} <EOL>]
 <FileSystemGuid>    ::= <TS> "FileSystemGuid" <Eq> <NamedGuidOrPcd> <EOL>
+<VariableSignatureGuid> ::= <TS> "VariableSignatureGuid" <Eq> <NamedGuidOrPcd> <EOL>
+<VariabeRegionSize> ::= <TS> "VariabeRegionSize" <Eq> <UINT32> <EOL>
+<FtwWorkingSpaceSize>   ::= <TS> "FtwWorkingSpaceSize" <Eq> <UINT32> <EOL>
+<FtwSpareSpaceSize>     ::= <TS> "FtwSpareSpaceSize" <Eq> <UINT32> <EOL>
 <FvNameGuid>        ::= <TS> "FvNameGuid" <Eq> <NamedGuidOrPcd> <EOL>
 <FvUsedSize>        ::= <TS> "FvUsedSizeEnable" <Eq> <TrueFalse> <EOL>
 <FvNameString>      ::= <TS> "FvNameString" <Eq> <TrueFalse> <EOL>
 <PeiAprioriSection> ::= <TS> "APRIORI" <MTS> "PEI" <MTS>
                         "{" <EOL>
@@ -279,10 +287,15 @@ Conditional statements may be used anywhere within this section.
 <GuidStmt>          ::= {"before"} {"after"} <MTS> <Filename>
 <SmmDepexExp>       ::= <TS> "SECTION" <MTS> [<FfsAlignment>] "SMM_DEPEX_EXP"
                         <Eq> "{" [<EOL>] <DxeDepex> "}" <EOL>
 ```
 
+**********
+**Note:** The `VariableSignatureGuid` and `VariabeRegionSize` must exist when
+`FileSystemGuid` value is same as FFF12B8D-7696-4C8B-A9852747075B4F50.
+**********
+
 #### Restrictions
 
 **_Filename_**
 
 For BINARY ONLY content (`UEFI_DRIVER` and `UEFI_APPLICATION` .efi files) the
diff --git a/README.md b/README.md
index 05b3b7a..cd489ee 100644
--- a/README.md
+++ b/README.md
@@ -212,5 +212,6 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
 |            | 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                                                                                                                |               |
 |            | document WEAK_ALIGNMENT attribute                                                                                                                                          |               |
+|            | support varstore template generation with a [FV] section                                                                                                                   |               |
-- 
2.6.1.windows.1