[FdfSpecification Patch] FDF spec: Fix the issue in Rule section for RAW Type File

[FdfSpecification Patch] FDF spec: Fix the issue in Rule section for RAW Type File

[Liming Gao]

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

FV File Statement clarifies RAW File type with file name only.
But, FFS Rule section doesn't support this syntax. This is an issue
in FDF spec. Per PI spec, RAW File has no section. It directly includes
file data. So, FFS Rule section should support this usage.

Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 3_edk_ii_fdf_file_format/39_[rule]_sections.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 34e767f..d5ec895 100644
--- a/3_edk_ii_fdf_file_format/39_[rule]_sections.md
+++ b/3_edk_ii_fdf_file_format/39_[rule]_sections.md
@@ -125,7 +125,8 @@ Conditional statements may be used anywhere within this section.
 <FileOpts>          ::= ["Fixed" <MTS>] ["Checksum" <MTS>]
                         [<FfsAlignment>]
 <FfsAlignment>      ::= "Align" <Eq> <FfsAlignmentValues> <MTS>
-<FileSpec>          ::= {<SimpleFile>} {<ComplexFile>} {<SbtGuid>}
+<FileSpec>          ::= {<SimpleFile>} {<ComplexFile>} {<SbtGuid>} {<DataFile>}
+<DataFile>          ::= "{" <VarFile> "}"
 <SimpleFile>        ::= <LeafSecType> [<FileOpts>] <VarFile> <EOL>
 <LeafSecType>       ::= {"COMPAT16"} {"PE32"} {"PIC"} {"TE"}
                         {"FV_IMAGE"} {"RAW"} {"DXE_DEPEX"} {"UI"}
-- 
2.13.0.windows.1

Re: [edk2-devel] [FdfSpecification Patch] FDF spec: Fix the issue in Rule section for RAW Type File

[Bob Feng]

Patch looks fine.

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Liming Gao
Sent: Tuesday, May 28, 2019 11:24 PM
To: devel@edk2.groups.io
Subject: [edk2-devel] [FdfSpecification Patch] FDF spec: Fix the issue in Rule section for RAW Type File

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

FV File Statement clarifies RAW File type with file name only.
But, FFS Rule section doesn't support this syntax. This is an issue in FDF spec. Per PI spec, RAW File has no section. It directly includes file data. So, FFS Rule section should support this usage.

Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 3_edk_ii_fdf_file_format/39_[rule]_sections.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 34e767f..d5ec895 100644
--- a/3_edk_ii_fdf_file_format/39_[rule]_sections.md
+++ b/3_edk_ii_fdf_file_format/39_[rule]_sections.md
@@ -125,7 +125,8 @@ Conditional statements may be used anywhere within this section.
 <FileOpts>          ::= ["Fixed" <MTS>] ["Checksum" <MTS>]
                         [<FfsAlignment>]
 <FfsAlignment>      ::= "Align" <Eq> <FfsAlignmentValues> <MTS>
-<FileSpec>          ::= {<SimpleFile>} {<ComplexFile>} {<SbtGuid>}
+<FileSpec>          ::= {<SimpleFile>} {<ComplexFile>} {<SbtGuid>} {<DataFile>}
+<DataFile>          ::= "{" <VarFile> "}"
 <SimpleFile>        ::= <LeafSecType> [<FileOpts>] <VarFile> <EOL>
 <LeafSecType>       ::= {"COMPAT16"} {"PE32"} {"PIC"} {"TE"}
                         {"FV_IMAGE"} {"RAW"} {"DXE_DEPEX"} {"UI"}
--
2.13.0.windows.1