[edk2-FdfSpecification PATCH] [edk2-FdfSpecification PATCH] [FmpPayload] supports 1 or 2 FILE DATA statements

[edk2-FdfSpecification PATCH] [edk2-FdfSpecification PATCH] [FmpPayload] supports 1 or 2 FILE DATA statements

[Michael Kinney]

https://bugzilla.tianocore.org/show_bug.cgi?id=461

Update the EBNF for [FmpPayload] in Section 3.8 to
allow one or two FILE DATA statements.  The first
for the update image.  The second for venddor code.

GitHub branch for review:

  https://github.com/mdkinney/edk2-FdfSpecification/tree/Bugzilla_461_FmpFileData_2_Files

GitHub branch compare against latest DRAFT for review:

  https://github.com/tianocore-docs/edk2-FdfSpecification/compare/master...mdkinney:Bugzilla_461_FmpFileData_2_Files?w=1  
  
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>

Michael Kinney (1):
  [FmpPayload] supports 1 or 2 FILE DATA statements

 3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md | 9 ++++++++-
 README.md                                            | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

-- 
2.6.3.windows.1

[edk2-FdfSpecification PATCH] [FmpPayload] supports 1 or 2 FILE DATA statements

[Michael Kinney]

https://bugzilla.tianocore.org/show_bug.cgi?id=461

Update the EBNF for [FmpPayload] in Section 3.8 to
allow one or two FILE DATA statements.  The first
for the update image.  The second for venddor code.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md | 9 ++++++++-
 README.md                                            | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md b/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
index 1c38f59..77ad2b7 100644
--- a/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
+++ b/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
@@ -34,12 +34,19 @@
 These are optional sections that describes the FMP payload content for FMP
 Capsule files.
 
+There must be at least one and at most two `<FmpFileData>` statements.  The
+`<FmpFileData>` statements start with `FILE DATA`.  The first <FmpFileData>
+statement provides the information for UpdateImage in an
+`EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER`.  The second <FmpFileData>
+statement, if present, provides the information for VendorCode in an
+`EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER`.
+
 #### Prototype
 
 ```c
 <FmpPayload>  ::= "[FmpPayload" <UiFmpName> "]" <EOL>
                   <FmpTokens>
-                  <FmpFileData>
+                  <FmpFileData>{1,2}
 <FmpTokens>   ::= [<TS> "IMAGE_HEADER_INIT_VERSION" <Eq> <Hex2> <EOL>]
                   <TS> "IMAGE_TYPE_ID" <Eq> <RegistryFormatGUID> <EOL>
                   [<TS> "IMAGE_INDEX" <Eq> <Hex2> <EOL>]
diff --git a/README.md b/README.md
index 9a7f13a..f7e1d1f 100644
--- a/README.md
+++ b/README.md
@@ -196,3 +196,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
 |            | Clarified [UserExtensions] content in chapter 2 (to match implementation)                                                                                                  |               |
 | 1.28       | Convert to GitBooks                                                                                                                                                        | March 2017    |
 |            | [#426](https://bugzilla.tianocore.org/show_bug.cgi?id=426) IMAGE_TYPE_ID must be provided with value, FDF should mark it as required section                               |               |
+|            | [#461](https://bugzilla.tianocore.org/show_bug.cgi?id=461) FDF Spec: add a super script number for the <FmpFileData>                                                       |               |
-- 
2.6.3.windows.1

Re: [edk2-FdfSpecification PATCH] [FmpPayload] supports 1 or 2 FILE DATA statements

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Kinney, Michael D 
Sent: Friday, April 7, 2017 4:00 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Shaw, Kevin W <kevin.w.shaw@intel.com>
Subject: [edk2-FdfSpecification PATCH] [FmpPayload] supports 1 or 2 FILE DATA statements

https://bugzilla.tianocore.org/show_bug.cgi?id=461

Update the EBNF for [FmpPayload] in Section 3.8 to allow one or two FILE DATA statements.  The first for the update image.  The second for venddor code.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md | 9 ++++++++-
 README.md                                            | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md b/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
index 1c38f59..77ad2b7 100644
--- a/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
+++ b/3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md
@@ -34,12 +34,19 @@
 These are optional sections that describes the FMP payload content for FMP  Capsule files.
 
+There must be at least one and at most two `<FmpFileData>` statements.  
+The `<FmpFileData>` statements start with `FILE DATA`.  The first 
+<FmpFileData> statement provides the information for UpdateImage in an 
+`EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER`.  The second 
+<FmpFileData> statement, if present, provides the information for 
+VendorCode in an `EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER`.
+
 #### Prototype
 
 ```c
 <FmpPayload>  ::= "[FmpPayload" <UiFmpName> "]" <EOL>
                   <FmpTokens>
-                  <FmpFileData>
+                  <FmpFileData>{1,2}
 <FmpTokens>   ::= [<TS> "IMAGE_HEADER_INIT_VERSION" <Eq> <Hex2> <EOL>]
                   <TS> "IMAGE_TYPE_ID" <Eq> <RegistryFormatGUID> <EOL>
                   [<TS> "IMAGE_INDEX" <Eq> <Hex2> <EOL>] diff --git a/README.md b/README.md index 9a7f13a..f7e1d1f 100644
--- a/README.md
+++ b/README.md
@@ -196,3 +196,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
 |            | Clarified [UserExtensions] content in chapter 2 (to match implementation)                                                                                                  |               |
 | 1.28       | Convert to GitBooks                                                                                                                                                        | March 2017    |
 |            | [#426](https://bugzilla.tianocore.org/show_bug.cgi?id=426) IMAGE_TYPE_ID must be provided with value, FDF should mark it as required section                               |               |
+|            | [#461](https://bugzilla.tianocore.org/show_bug.cgi?id=461) FDF Spec: add a super script number for the <FmpFileData>                                                       |               |
--
2.6.3.windows.1