[Patch] BaseTools: Fix the Keyword error for <ExtendedFvEntry> in FDF File

[Patch] BaseTools: Fix the Keyword error for <ExtendedFvEntry> in FDF File

[Yonghong Zhu]

current in FDF spec 3.6 [FV] section it use "FV_EXT_ENTRY_TYPE" as
Keyword for <ExtendedFvEntry>, while in the code it use "FV_EXT_ENTRY".
To keep compatibility, this patch support both keyword in the code
first.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/GenFds/FdfParser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index b95afc7..0190be8 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2363,11 +2363,11 @@ class FdfParser:
 
         return True
 
     def __GetFvExtEntryStatement(self, FvObj):
 
-        if not self.__IsKeyword( "FV_EXT_ENTRY"):
+        if not (self.__IsKeyword( "FV_EXT_ENTRY") or self.__IsKeyword( "FV_EXT_ENTRY_TYPE")):
             return False
 
         if not self.__IsKeyword ("TYPE"):
             raise Warning("expected 'TYPE'", self.FileName, self.CurrentLineNumber)
             
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Fix the Keyword error for <ExtendedFvEntry> in FDF File

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Zhu, Yonghong
>Sent: Monday, October 09, 2017 9:37 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [Patch] BaseTools: Fix the Keyword error for <ExtendedFvEntry> in
>FDF File
>
>current in FDF spec 3.6 [FV] section it use "FV_EXT_ENTRY_TYPE" as
>Keyword for <ExtendedFvEntry>, while in the code it use "FV_EXT_ENTRY".
>To keep compatibility, this patch support both keyword in the code
>first.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/GenFds/FdfParser.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py
>b/BaseTools/Source/Python/GenFds/FdfParser.py
>index b95afc7..0190be8 100644
>--- a/BaseTools/Source/Python/GenFds/FdfParser.py
>+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
>@@ -2363,11 +2363,11 @@ class FdfParser:
>
>         return True
>
>     def __GetFvExtEntryStatement(self, FvObj):
>
>-        if not self.__IsKeyword( "FV_EXT_ENTRY"):
>+        if not (self.__IsKeyword( "FV_EXT_ENTRY") or
>self.__IsKeyword( "FV_EXT_ENTRY_TYPE")):
>             return False
>
>         if not self.__IsKeyword ("TYPE"):
>             raise Warning("expected 'TYPE'", self.FileName,
>self.CurrentLineNumber)
>
>--
>2.6.1.windows.1