from Common.Expression import *\r
from Common import GlobalData\r
from Common.String import ReplaceMacro\r
-\r
+import uuid\r
from Common.Misc import tdict\r
\r
-import re\r
import Common.LongFilePathOs as os\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Capsule import EFI_CERT_TYPE_PKCS7_GUID\r
+from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID\r
\r
##define T_CHAR_SPACE ' '\r
##define T_CHAR_NULL '\0'\r
if Profile.IsLineInFile(Line):\r
return Profile.GetLineInFile(Line)\r
elif Line >= Profile.InsertStartLineNumber and Profile.Level == 1:\r
- InsertedLines += Profile.GetTotalLines()\r
+ InsertedLines += Profile.GetTotalLines()\r
\r
return (File, Line - InsertedLines)\r
\r
TotalLines = self.InsertAdjust + len(self.FileLinesList)\r
\r
for Profile in self.IncludeFileList:\r
- TotalLines += Profile.GetTotalLines()\r
+ TotalLines += Profile.GetTotalLines()\r
\r
return TotalLines\r
\r
\r
self.PcdDict = {}\r
self.InfList = []\r
+ self.InfDict = {'ArchTBD':[]}\r
# ECC will use this Dict and List information\r
self.PcdFileLineDict = {}\r
self.InfFileLineList = []\r
self.__UndoToken()\r
return False\r
\r
+ def __Verify(self, Name, Value, Scope):\r
+ if Scope in ['UINT64', 'UINT8']:\r
+ ValueNumber = 0\r
+ try:\r
+ if Value.upper().startswith('0X'):\r
+ ValueNumber = int (Value, 16)\r
+ else:\r
+ ValueNumber = int (Value)\r
+ except:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "The value is not valid dec or hex number for %s." % Name)\r
+ if ValueNumber < 0:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "The value can't be set to negative value for %s." % Name)\r
+ if Scope == 'UINT64':\r
+ if ValueNumber >= 0x10000000000000000:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)\r
+ if Scope == 'UINT8':\r
+ if ValueNumber >= 0x100:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)\r
+ return True\r
+\r
## __UndoToken() method\r
#\r
# Go back one token unit in file buffer\r
\r
try:\r
self.Preprocess()\r
- while self.__GetFd():\r
- pass\r
-\r
- while self.__GetFv():\r
- pass\r
-\r
- while self.__GetFmp():\r
- pass\r
-\r
- while self.__GetCapsule():\r
- pass\r
-\r
- while self.__GetVtf():\r
- pass\r
-\r
- while self.__GetRule():\r
- pass\r
- \r
- while self.__GetOptionRom():\r
+ #\r
+ # Keep processing sections of the FDF until no new sections or a syntax error is found\r
+ #\r
+ while self.__GetFd() or self.__GetFv() or self.__GetFmp() or self.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOptionRom():\r
pass\r
\r
except Warning, X:\r
% (FileLineTuple[1], self.CurrentOffsetWithinLine + 1, self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine :].rstrip('\n').rstrip('\r'))\r
raise\r
\r
+ ## SectionParser() method\r
+ #\r
+ # Parse the file section info\r
+ # Exception will be raised if syntax error found\r
+ #\r
+ # @param self The object pointer\r
+ # @param section The section string\r
+\r
+ def SectionParser(self, section):\r
+ S = section.upper()\r
+ if not S.startswith("[DEFINES") and not S.startswith("[FD.") and not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
+ and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM.") and not S.startswith('[FMPPAYLOAD.'):\r
+ raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.], [FMPPAYLOAD.])", self.FileName, self.CurrentLineNumber)\r
+\r
## __GetDefines() method\r
#\r
# Get Defines section contents and store its data into AllMacrosList\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[DEFINES"):\r
- if not S.startswith("[FD.") and not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionType = "FV"\r
- RegionObj.RegionDataList.append(self.__Token)\r
+ RegionObj.RegionDataList.append((self.__Token).upper())\r
\r
while self.__IsKeyword( "FV"):\r
\r
if not self.__GetNextToken():\r
raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
\r
- RegionObj.RegionDataList.append(self.__Token)\r
+ RegionObj.RegionDataList.append((self.__Token).upper())\r
\r
## __GetRegionCapType() method\r
#\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[FV."):\r
- if not S.startswith('[FMPPAYLOAD.') and not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
self.Profile.InfList.append(ffsInf.InfFileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.InfFileLineList.append(FileLineTuple)\r
+ if ffsInf.UseArch:\r
+ if ffsInf.UseArch not in self.Profile.InfDict:\r
+ self.Profile.InfDict[ffsInf.UseArch] = [ffsInf.InfFileName]\r
+ else:\r
+ self.Profile.InfDict[ffsInf.UseArch].append(ffsInf.InfFileName)\r
+ else:\r
+ self.Profile.InfDict['ArchTBD'].append(ffsInf.InfFileName)\r
\r
if self.__IsToken('|'):\r
if self.__IsKeyword('RELOCS_STRIPPED'):\r
#\r
def __GetRAWData(self, FfsFileObj, MacroDict = {}):\r
FfsFileObj.FileName = []\r
- FfsFileObj.Alignment = []\r
- AlignDict = {"Auto":1, "8":8, "16":16, "32":32, "64":64, "128":128, "512":512, "1K":1024, "4K":4096, "32K":32768, "64K":65536}\r
+ FfsFileObj.SubAlignment = []\r
while True:\r
AlignValue = None\r
if self.__GetAlignment():\r
if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- AlignValue = AlignValue = AlignDict[self.__Token]\r
+ AlignValue = self.__Token\r
if not self.__GetNextToken():\r
raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)\r
\r
if FileName == '}':\r
self.__UndoToken()\r
raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)\r
- elif not os.path.isfile(FileName):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
\r
self.__VerifyFile(FileName)\r
File = PathClass(NormPath(FileName), GenFdsGlobalVariable.WorkSpaceDir)\r
FfsFileObj.FileName.append(File.Path)\r
- FfsFileObj.Alignment.append(AlignValue)\r
+ FfsFileObj.SubAlignment.append(AlignValue)\r
\r
if self.__IsToken( "}"):\r
self.__UndoToken()\r
break\r
\r
- if len(FfsFileObj.Alignment) == 1:\r
- FfsFileObj.Alignment = FfsFileObj.Alignment[0]\r
+ if len(FfsFileObj.SubAlignment) == 1:\r
+ FfsFileObj.SubAlignment = FfsFileObj.SubAlignment[0]\r
if len(FfsFileObj.FileName) == 1:\r
FfsFileObj.FileName = FfsFileObj.FileName[0]\r
\r
if not self.__GetNextToken():\r
return False\r
S = self.__Token.upper()\r
- if not S.startswith("[FMPPAYLOAD."):\r
- if not S.startswith("[CAPSULE.") and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [FmpPayload.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ if S.startswith("[") and not S.startswith("[FMPPAYLOAD."):\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
\r
if not self.__GetNextToken():\r
raise Warning("The FMP payload section is empty!", self.FileName, self.CurrentLineNumber)\r
- FmpKeyList = ['IMAGE_HEADER_INIT_VERSION', 'IMAGE_TYPE_ID', 'IMAGE_INDEX', 'HARDWARE_INSTANCE']\r
+ FmpKeyList = ['IMAGE_HEADER_INIT_VERSION', 'IMAGE_TYPE_ID', 'IMAGE_INDEX', 'HARDWARE_INSTANCE', 'CERTIFICATE_GUID', 'MONOTONIC_COUNT']\r
while self.__Token in FmpKeyList:\r
Name = self.__Token\r
FmpKeyList.remove(Name)\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if Name == 'IMAGE_TYPE_ID':\r
if not self.__GetNextGuid():\r
- raise Warning("expected GUID value for IMAGE_TYPE_ID", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected GUID value for IMAGE_TYPE_ID.", self.FileName, self.CurrentLineNumber)\r
FmpData.ImageTypeId = self.__Token\r
+ elif Name == 'CERTIFICATE_GUID':\r
+ if not self.__GetNextGuid():\r
+ raise Warning("expected GUID value for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
+ FmpData.Certificate_Guid = self.__Token\r
+ if uuid.UUID(FmpData.Certificate_Guid) != EFI_CERT_TYPE_RSA2048_SHA256_GUID and uuid.UUID(FmpData.Certificate_Guid) != EFI_CERT_TYPE_PKCS7_GUID:\r
+ raise Warning("Only support EFI_CERT_TYPE_RSA2048_SHA256_GUID or EFI_CERT_TYPE_PKCS7_GUID for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
else:\r
if not self.__GetNextToken():\r
raise Warning("expected value of %s" % Name, self.FileName, self.CurrentLineNumber)\r
Value = self.__Token\r
if Name == 'IMAGE_HEADER_INIT_VERSION':\r
- FmpData.Version = Value\r
+ if self.__Verify(Name, Value, 'UINT8'):\r
+ FmpData.Version = Value\r
elif Name == 'IMAGE_INDEX':\r
- FmpData.ImageIndex = Value\r
+ if self.__Verify(Name, Value, 'UINT8'):\r
+ FmpData.ImageIndex = Value\r
elif Name == 'HARDWARE_INSTANCE':\r
- FmpData.HardwareInstance = Value\r
+ if self.__Verify(Name, Value, 'UINT8'):\r
+ FmpData.HardwareInstance = Value\r
+ elif Name == 'MONOTONIC_COUNT':\r
+ if self.__Verify(Name, Value, 'UINT64'):\r
+ FmpData.MonotonicCount = Value\r
+ if FmpData.MonotonicCount.upper().startswith('0X'):\r
+ FmpData.MonotonicCount = (long)(FmpData.MonotonicCount, 16)\r
+ else:\r
+ FmpData.MonotonicCount = (long)(FmpData.MonotonicCount)\r
if not self.__GetNextToken():\r
break\r
else:\r
self.__UndoToken()\r
\r
+ if (FmpData.MonotonicCount and not FmpData.Certificate_Guid) or (not FmpData.MonotonicCount and FmpData.Certificate_Guid):\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "CERTIFICATE_GUID and MONOTONIC_COUNT must be work as a pair.")\r
+ # remove CERTIFICATE_GUID and MONOTONIC_COUNT from FmpKeyList, since these keys are optional\r
+ if 'CERTIFICATE_GUID' in FmpKeyList:\r
+ FmpKeyList.remove('CERTIFICATE_GUID')\r
+ if 'MONOTONIC_COUNT' in FmpKeyList:\r
+ FmpKeyList.remove('MONOTONIC_COUNT')\r
if FmpKeyList:\r
- raise Warning("Missing keywords %s in FMP payload section" % ', '.join(FmpKeyList), self.FileName, self.CurrentLineNumber)\r
- ImageFile = self.__ParseRawFileStatement()\r
- if not ImageFile:\r
- raise Warning("Missing image file in FMP payload section", self.FileName, self.CurrentLineNumber)\r
- FmpData.ImageFile = ImageFile\r
- VendorCodeFile = self.__ParseRawFileStatement()\r
- if VendorCodeFile:\r
- FmpData.VendorCodeFile = VendorCodeFile\r
+ raise Warning("Missing keywords %s in FMP payload section." % ', '.join(FmpKeyList), self.FileName, self.CurrentLineNumber)\r
+ # get the Image file and Vendor code file\r
+ self.__GetFMPCapsuleData(FmpData)\r
+ if not FmpData.ImageFile:\r
+ raise Warning("Missing image file in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
+ # check whether more than one Vendor code file\r
+ if len(FmpData.VendorCodeFile) > 1:\r
+ raise Warning("At most one Image file and one Vendor code file are allowed in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
self.Profile.FmpPayloadDict[FmpUiName] = FmpData\r
return True\r
\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[CAPSULE."):\r
- if not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile or IsAfile or IsFmp):\r
break\r
\r
+ ## __GetFMPCapsuleData() method\r
+ #\r
+ # Get capsule data for FMP capsule\r
+ #\r
+ # @param self The object pointer\r
+ # @param Obj for whom capsule data are got\r
+ #\r
+ def __GetFMPCapsuleData(self, Obj):\r
+\r
+ while True:\r
+ IsFv = self.__GetFvStatement(Obj, True)\r
+ IsFd = self.__GetFdStatement(Obj, True)\r
+ IsAnyFile = self.__GetAnyFileStatement(Obj, True)\r
+ if not (IsFv or IsFd or IsAnyFile):\r
+ break\r
+\r
## __GetFvStatement() method\r
#\r
# Get FV for capsule\r
# @retval True Successfully find a FV statement\r
# @retval False Not able to find a FV statement\r
#\r
- def __GetFvStatement(self, CapsuleObj):\r
+ def __GetFvStatement(self, CapsuleObj, FMPCapsule = False):\r
\r
if not self.__IsKeyword("FV"):\r
return False\r
\r
CapsuleFv = CapsuleData.CapsuleFv()\r
CapsuleFv.FvName = self.__Token\r
- CapsuleObj.CapsuleDataList.append(CapsuleFv)\r
+ if FMPCapsule:\r
+ if not CapsuleObj.ImageFile:\r
+ CapsuleObj.ImageFile.append(CapsuleFv)\r
+ else:\r
+ CapsuleObj.VendorCodeFile.append(CapsuleFv)\r
+ else:\r
+ CapsuleObj.CapsuleDataList.append(CapsuleFv)\r
return True\r
\r
## __GetFdStatement() method\r
# @retval True Successfully find a FD statement\r
# @retval False Not able to find a FD statement\r
#\r
- def __GetFdStatement(self, CapsuleObj):\r
+ def __GetFdStatement(self, CapsuleObj, FMPCapsule = False):\r
\r
if not self.__IsKeyword("FD"):\r
return False\r
\r
CapsuleFd = CapsuleData.CapsuleFd()\r
CapsuleFd.FdName = self.__Token\r
- CapsuleObj.CapsuleDataList.append(CapsuleFd)\r
+ if FMPCapsule:\r
+ if not CapsuleObj.ImageFile:\r
+ CapsuleObj.ImageFile.append(CapsuleFd)\r
+ else:\r
+ CapsuleObj.VendorCodeFile.append(CapsuleFd)\r
+ else:\r
+ CapsuleObj.CapsuleDataList.append(CapsuleFd)\r
return True\r
\r
def __GetFmpStatement(self, CapsuleObj):\r
- if not self.__IsKeyword("FMP"):\r
- return False\r
+ if not self.__IsKeyword("FMP_PAYLOAD"):\r
+ if not self.__IsKeyword("FMP"):\r
+ return False\r
\r
- if not self.__IsKeyword("PAYLOAD"):\r
- self.__UndoToken()\r
- return False\r
+ if not self.__IsKeyword("PAYLOAD"):\r
+ self.__UndoToken()\r
+ return False\r
\r
if not self.__IsToken("="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__GetNextToken():\r
- raise Warning("expected payload name after FMP PAYLOAD =", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected payload name after FMP_PAYLOAD =", self.FileName, self.CurrentLineNumber)\r
Payload = self.__Token.upper()\r
if Payload not in self.Profile.FmpPayloadDict:\r
raise Warning("This FMP Payload does not exist: %s" % self.__Token, self.FileName, self.CurrentLineNumber)\r
raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
\r
AnyFileName = self.__Token\r
- AnyFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(AnyFileName)\r
- if not os.path.exists(AnyFileName):\r
- raise Warning("File %s not exists"%AnyFileName, self.FileName, self.CurrentLineNumber)\r
+ self.__VerifyFile(AnyFileName)\r
+\r
return AnyFileName\r
\r
## __GetAnyFileStatement() method\r
# @retval True Successfully find a Anyfile statement\r
# @retval False Not able to find a AnyFile statement\r
#\r
- def __GetAnyFileStatement(self, CapsuleObj):\r
+ def __GetAnyFileStatement(self, CapsuleObj, FMPCapsule = False):\r
AnyFileName = self.__ParseRawFileStatement()\r
if not AnyFileName:\r
return False\r
\r
CapsuleAnyFile = CapsuleData.CapsuleAnyFile()\r
CapsuleAnyFile.FileName = AnyFileName\r
- CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)\r
+ if FMPCapsule:\r
+ if not CapsuleObj.ImageFile:\r
+ CapsuleObj.ImageFile.append(CapsuleAnyFile)\r
+ else:\r
+ CapsuleObj.VendorCodeFile.append(CapsuleAnyFile)\r
+ else:\r
+ CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)\r
return True\r
\r
## __GetAfileStatement() method\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[RULE."):\r
- if not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
self.__UndoToken()\r
#\r
def __GetFileExtension(self):\r
if not self.__IsToken("."):\r
- raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
\r
Ext = ""\r
if self.__GetNextToken():\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[VTF."):\r
- if not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
+ self.__UndoToken()\r
+ return False\r
\r
self.__UndoToken()\r
if not self.__IsToken("[OptionRom.", True):\r
self.Profile.InfList.append(ffsInf.InfFileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.InfFileLineList.append(FileLineTuple)\r
+ if ffsInf.UseArch:\r
+ if ffsInf.UseArch not in self.Profile.InfDict:\r
+ self.Profile.InfDict[ffsInf.UseArch] = [ffsInf.InfFileName]\r
+ else:\r
+ self.Profile.InfDict[ffsInf.UseArch].append(ffsInf.InfFileName)\r
+ else:\r
+ self.Profile.InfDict['ArchTBD'].append(ffsInf.InfFileName)\r
\r
\r
self.__GetOptRomOverrides (ffsInf)\r
projects / mirror_edk2.git / blobdiff