Re: [edk2] [edk2-FdfSpecification Patch] FILE RAW Multiple binaries and FmpPayload extensions

2017-04-10 Thread Zhu, Yonghong 

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

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Michael 
Kinney
Sent: Wednesday, April 5, 2017 3:54 PM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming@intel.com>
Subject: [edk2] [edk2-FdfSpecification Patch] FILE RAW Multiple binaries and 
FmpPayload extensions

* Changed the FDF_SPECIFICATION value from 0x0001001A to
  0x0001001B or 1.27
* Extended the FV and Capsule, FILE RAW statement formats to
  support multiple binary files.
* Changed section 3.8 [FmpPayload] to add definitions for
  MONOTONIC_COUNT and CERTIFICATE_GUID, plus some notes about
  how these are used.

The document changes in this patch are in Gitbook format and are equivalent to 
the changes in the EDK II FDF File Spec v1.27 DRAFT for Review that was posted 
as a PDF with change bars on the tianocore site in September 2016.

  
https://github.com/tianocore-docs/Docs/raw/master/Specifications/FDF_Spec_1_27_Review_Draft.pdf

These same document changes are also availabe in the following GIT branch:
  
  https://github.com/mdkinney/edk2-FdfSpecification/tree/FileRawMultipleBinary

The content difference between the latest DRAFT and this change can be viewed 
at the following link.  The ?w=1 performs a word diff and ignores white space 
changes.
  
  
https://github.com/tianocore-docs/edk2-FdfSpecification/compare/master...mdkinney:FileRawMultipleBinary?w=1
  
Cc: Liming Gao <liming@intel.com>
Cc: Yonghong Zhu <yonghong@intel.com>
Cc: Kevin W Shaw <kevin.w.s...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kin...@intel.com>

Michael Kinney (1):
  FILE RAW Multiple binaries and FmpPayload extensions

 2_fdf_design_discussion/README.md|  8 
 3_edk_ii_fdf_file_format/34_[defines]_section.md | 17 +
 3_edk_ii_fdf_file_format/36_[fv]_sections.md | 16 ++--
 3_edk_ii_fdf_file_format/37_[capsule]_sections.md|  5 +++--
 3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md | 10 ++
 README.md|  5 -
 6 files changed, 44 insertions(+), 17 deletions(-)

--
2.6.3.windows.1

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

[edk2] [edk2-FdfSpecification Patch] FILE RAW Multiple binaries and FmpPayload extensions

2017-04-05 Thread Michael Kinney 
* Changed the FDF_SPECIFICATION value from 0x0001001A to
  0x0001001B or 1.27
* Extended the FV and Capsule, FILE RAW statement formats to
  support multiple binary files.
* Changed section 3.8 [FmpPayload] to add definitions for
  MONOTONIC_COUNT and CERTIFICATE_GUID, plus some notes about
  how these are used.

Cc: Liming Gao 
Cc: Yonghong Zhu 
Cc: Kevin W Shaw 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney 
---
 2_fdf_design_discussion/README.md|  8 
 3_edk_ii_fdf_file_format/34_[defines]_section.md | 17 +
 3_edk_ii_fdf_file_format/36_[fv]_sections.md | 16 ++--
 3_edk_ii_fdf_file_format/37_[capsule]_sections.md|  5 +++--
 3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md | 10 ++
 README.md|  5 -
 6 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/2_fdf_design_discussion/README.md 
b/2_fdf_design_discussion/README.md
index 37e37c7..3202f56 100644
--- a/2_fdf_design_discussion/README.md
+++ b/2_fdf_design_discussion/README.md
@@ -50,10 +50,10 @@ The EDK II Build generates UEFI and PI specification 
compliant binary images.
 The tools provided in the EDK and the EdkCompatibilityPkg module support
 earlier versions of the specifications.
 
-This revision of the specification adds support for multiple EDK II Packages
-directories outside of the WORKSPACE. FDF files that use this feature must
-use the new `FDF_SPECIFICATION = 0x00010019` in the `[Defines]` section. Older
-FDF files do not need to update the `FDF_SPECIFICATION` value.
+This revision of the specification adds support for multiple binary files in
+an FV FILE RAW statement. FDF files that use this feature must use the new
+`FDF_SPECIFICATION = 0x0001001B` in the `[Defines]` section. Older FDF files
+do not need to update the `FDF_SPECIFICATION` value.
 
 The EDK II build system has been updated to allow the setting of multiple paths
 that will be searched when attempting to resolve the location of EDK II
diff --git a/3_edk_ii_fdf_file_format/34_[defines]_section.md 
b/3_edk_ii_fdf_file_format/34_[defines]_section.md
index 789f114..eec7698 100644
--- a/3_edk_ii_fdf_file_format/34_[defines]_section.md
+++ b/3_edk_ii_fdf_file_format/34_[defines]_section.md
@@ -40,14 +40,15 @@ This section describes the defines section content in the 
FDF files. This file
 can be created by a developer and is an input to the EDK II build tool parsing
 utilities. Elements may appear in any order within this section.
 
-The code for this version of the FDF specification is "0x0001001A" and new
-versions of this specification must increment the minor (001A) portion of the
-specification code for backward compatible changes, and increment the major
-number for non-backward compatible specification changes.
-
-This revision of the specification adds FMP Capsule support. Any FDF file that
-uses this feature must use the 0x0001001A FDF_SPECIFICATION value. Older FDF
-files that do not use this feature do not need to update the value.
+The code for this version of the FDF specification is "0x0001001B". New
+versions of this specification must increment the minor (001B) portion of the
+specification code for backward-compatible changes, and increment the major
+specification number for non-backward-compatible changes.
+
+This revision of the specification adds support for multiple binaries in an
+FV or Capsule RAW FILE statement. Any FDF file that uses this feature must use
+the value `0x0001001B` in the `FDF_SPECIFICATION` statement. Older FDF files
+that do not use this feature do not need to update the value.
 
 Conditional statements may be used anywhere within this section.
 
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 b80f6be..f2d34cf 100644
--- a/3_edk_ii_fdf_file_format/36_[fv]_sections.md
+++ b/3_edk_ii_fdf_file_format/36_[fv]_sections.md
@@ -157,11 +157,13 @@ Conditional statements may be used anywhere within this 
section.
 {} {}   "}" []
   ::= [] [] 
 "{" []
-{} {}  "}" []
+ {} {+} { }
+"}" 
+  ::=  []  
   ::= ["FIXED" ] ["CHECKSUM" ]
 []
   ::= "Align"   
-  ::= {} {} {}
+  ::=  {} {} {} 
::=  "FV"   
::=  "FD"   
   ::= {} {"common"}
@@ -415,4 +417,14 @@ INF $(SAMPLE)/Universal/Network/Tcp4/Dxe/Tcp4.inf
 INF $(SAMPLE)/Universal/Network/Dhcp4/Dxe/Dhcp4.inf
 INF $(SAMPLE)/Universal/Network/Mtftp4/Dxe/Mtftp4.inf
 INF $(SAMPLE)/Universal/Network/SnpNt32/Dxe/SnpNt32.inf
+
+FILE RAW = 197DB236-F856-4924-90F8-CDF12FB975F3 {
+  $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$PLATFORM_ARCH)/File.bin
+}
+

[edk2] [edk2-FdfSpecification Patch] FILE RAW Multiple binaries and FmpPayload extensions

2017-04-05 Thread Michael Kinney 
* Changed the FDF_SPECIFICATION value from 0x0001001A to
  0x0001001B or 1.27
* Extended the FV and Capsule, FILE RAW statement formats to
  support multiple binary files.
* Changed section 3.8 [FmpPayload] to add definitions for
  MONOTONIC_COUNT and CERTIFICATE_GUID, plus some notes about
  how these are used.

The document changes in this patch are in Gitbook format and are equivalent to
the changes in the EDK II FDF File Spec v1.27 DRAFT for Review that was posted
as a PDF with change bars on the tianocore site in September 2016.

  
https://github.com/tianocore-docs/Docs/raw/master/Specifications/FDF_Spec_1_27_Review_Draft.pdf

These same document changes are also availabe in the following GIT branch:
  
  https://github.com/mdkinney/edk2-FdfSpecification/tree/FileRawMultipleBinary

The content difference between the latest DRAFT and this change can be 
viewed at the following link.  The ?w=1 performs a word diff and ignores
white space changes.
  
  
https://github.com/tianocore-docs/edk2-FdfSpecification/compare/master...mdkinney:FileRawMultipleBinary?w=1
  
Cc: Liming Gao 
Cc: Yonghong Zhu 
Cc: Kevin W Shaw 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney 

Michael Kinney (1):
  FILE RAW Multiple binaries and FmpPayload extensions

 2_fdf_design_discussion/README.md|  8 
 3_edk_ii_fdf_file_format/34_[defines]_section.md | 17 +
 3_edk_ii_fdf_file_format/36_[fv]_sections.md | 16 ++--
 3_edk_ii_fdf_file_format/37_[capsule]_sections.md|  5 +++--
 3_edk_ii_fdf_file_format/38_[fmppayload]_sections.md | 10 ++
 README.md|  5 -
 6 files changed, 44 insertions(+), 17 deletions(-)

-- 
2.6.3.windows.1

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