sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Extend FMP to support FV statement and FD statement

Browse Source 
This patch extend the <FmpFileData> to support <FvStatements> and
<FdStatenents>, just like the normal [Capsule] section format.
In order to fix the bug https://bugzilla.tianocore.org/show_bug.cgi?id=132

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu
2016-10-09 09:30:06 +08:00
parent ac9f5a295c
commit 19e3aa7a8a
3 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
BaseTools/Source/Python/GenFds/FdfParser.py
View File

@ -3259,15 +3259,12 @@ class FdfParser:
FmpKeyList.remove('MONOTONIC_COUNT')
if FmpKeyList:
raise Warning("Missing keywords %s in FMP payload section." % ', '.join(FmpKeyList), self.FileName, self.CurrentLineNumber)
ImageFile = self.__ParseRawFileStatement()
if not ImageFile:
# get the Image file and Vendor code file
self.__GetFMPCapsuleData(FmpData)
if not FmpData.ImageFile:
raise Warning("Missing image file in FMP payload section.", self.FileName, self.CurrentLineNumber)
FmpData.ImageFile = ImageFile
VendorCodeFile = self.__ParseRawFileStatement()
if VendorCodeFile:
FmpData.VendorCodeFile = VendorCodeFile
AdditionalFile = self.__ParseRawFileStatement()
if AdditionalFile:
# check whether more than one Vendor code file
if len(FmpData.VendorCodeFile) > 1:
raise Warning("At most one Image file and one Vendor code file are allowed in FMP payload section.", self.FileName, self.CurrentLineNumber)
self.Profile.FmpPayloadDict[FmpUiName] = FmpData
return True
@ -3400,6 +3397,22 @@ class FdfParser:
if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile or IsAfile or IsFmp):
break
## __GetFMPCapsuleData() method
#
# Get capsule data for FMP capsule
#
# @param self The object pointer
# @param Obj for whom capsule data are got
#
def __GetFMPCapsuleData(self, Obj):
while True:
IsFv = self.__GetFvStatement(Obj, True)
IsFd = self.__GetFdStatement(Obj, True)
IsAnyFile = self.__GetAnyFileStatement(Obj, True)
if not (IsFv or IsFd or IsAnyFile):
break
## __GetFvStatement() method
#
# Get FV for capsule
@ -3409,7 +3422,7 @@ class FdfParser:
# @retval True Successfully find a FV statement
# @retval False Not able to find a FV statement
#
def __GetFvStatement(self, CapsuleObj):
def __GetFvStatement(self, CapsuleObj, FMPCapsule = False):
if not self.__IsKeyword("FV"):
return False
@ -3425,7 +3438,13 @@ class FdfParser:
CapsuleFv = CapsuleData.CapsuleFv()
CapsuleFv.FvName = self.__Token
CapsuleObj.CapsuleDataList.append(CapsuleFv)
if FMPCapsule:
if not CapsuleObj.ImageFile:
CapsuleObj.ImageFile.append(CapsuleFv)
else:
CapsuleObj.VendorCodeFile.append(CapsuleFv)
else:
CapsuleObj.CapsuleDataList.append(CapsuleFv)
return True
## __GetFdStatement() method
@ -3437,7 +3456,7 @@ class FdfParser:
# @retval True Successfully find a FD statement
# @retval False Not able to find a FD statement
#
def __GetFdStatement(self, CapsuleObj):
def __GetFdStatement(self, CapsuleObj, FMPCapsule = False):
if not self.__IsKeyword("FD"):
return False
@ -3453,7 +3472,13 @@ class FdfParser:
CapsuleFd = CapsuleData.CapsuleFd()
CapsuleFd.FdName = self.__Token
CapsuleObj.CapsuleDataList.append(CapsuleFd)
if FMPCapsule:
if not CapsuleObj.ImageFile:
CapsuleObj.ImageFile.append(CapsuleFd)
else:
CapsuleObj.VendorCodeFile.append(CapsuleFd)
else:
CapsuleObj.CapsuleDataList.append(CapsuleFd)
return True
def __GetFmpStatement(self, CapsuleObj):
@ -3504,14 +3529,20 @@ class FdfParser:
# @retval True Successfully find a Anyfile statement
# @retval False Not able to find a AnyFile statement
#
def __GetAnyFileStatement(self, CapsuleObj):
def __GetAnyFileStatement(self, CapsuleObj, FMPCapsule = False):
AnyFileName = self.__ParseRawFileStatement()
if not AnyFileName:
return False
CapsuleAnyFile = CapsuleData.CapsuleAnyFile()
CapsuleAnyFile.FileName = AnyFileName
CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)
if FMPCapsule:
if not CapsuleObj.ImageFile:
CapsuleObj.ImageFile.append(CapsuleAnyFile)
else:
CapsuleObj.VendorCodeFile.append(CapsuleAnyFile)
else:
CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)
return True
## __GetAfileStatement() method