## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007, Intel Corporation\r
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
#\r
-# All rights reserved. This program and the accompanying materials\r
+# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
# http://opensource.org/licenses/bsd-license.php\r
import OptRomInfStatement\r
import OptRomFileStatement\r
\r
+from GenFdsGlobalVariable import GenFdsGlobalVariable\r
from Common.BuildToolError import *\r
from Common import EdkLogger\r
+from Common.Misc import PathClass\r
+from Common.String import NormPath\r
\r
import re\r
import os\r
self.InfList = []\r
\r
self.FdDict = {}\r
+ self.FdNameNotSet = False\r
self.FvDict = {}\r
self.CapsuleDict = {}\r
self.VtfList = []\r
self.__SkippedChars = ""\r
\r
self.__WipeOffArea = []\r
+ if GenFdsGlobalVariable.WorkSpaceDir == '':\r
+ GenFdsGlobalVariable.WorkSpaceDir = os.getenv("WORKSPACE")\r
\r
## __IsWhiteSpace() method\r
#\r
Offset += 1\r
\r
\r
+ def __GetMacroName(self):\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ MacroName = self.__Token\r
+ NotFlag = False\r
+ if MacroName.startswith('!'):\r
+ NotFlag = True\r
+ MacroName = MacroName[1:].strip()\r
+ \r
+ if not MacroName.startswith('$(') or not MacroName.endswith(')'):\r
+ raise Warning("Macro name expected(Please use '$(%(Token)s)' if '%(Token)s' is a macro.)" % {"Token" : MacroName},\r
+ self.FileName, self.CurrentLineNumber)\r
+ MacroName = MacroName[2:-1]\r
+ return MacroName, NotFlag\r
+ \r
## PreprocessFile() method\r
#\r
# Preprocess file contents, replace comments with spaces.\r
\r
self.Rewind()\r
\r
- ## PreprocessIncludeFile() method\r
+ def __GetIfListCurrentItemStat(self, IfList):\r
+ if len(IfList) == 0:\r
+ return True\r
+ \r
+ for Item in IfList:\r
+ if Item[1] == False:\r
+ return False\r
+ \r
+ return True\r
+ \r
+\r
+ ## PreprocessConditionalStatement() method\r
#\r
- # Preprocess file contents, replace !include statements with file contents.\r
+ # Preprocess conditional statement.\r
# In the end, rewind the file buffer pointer to the beginning\r
#\r
# @param self The object pointer\r
IfList = []\r
while self.__GetNextToken():\r
if self.__Token == 'DEFINE':\r
- DefineLine = self.CurrentLineNumber - 1\r
- DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
- Macro = self.__Token\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self.__GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
-\r
- if self.__GetStringData():\r
- pass\r
- Value = self.__Token\r
- if not Macro in InputMacroDict:\r
- FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)\r
- MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])\r
- MacProfile.MacroName = Macro\r
- MacProfile.MacroValue = Value\r
- AllMacroList.append(MacProfile)\r
- self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
+ if self.__GetIfListCurrentItemStat(IfList):\r
+ DefineLine = self.CurrentLineNumber - 1\r
+ DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ Macro = self.__Token\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ \r
+ if not self.__GetNextToken():\r
+ raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ \r
+ if self.__GetStringData():\r
+ pass\r
+ Value = self.__Token\r
+ if not Macro in InputMacroDict:\r
+ FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)\r
+ MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])\r
+ MacProfile.MacroName = Macro\r
+ MacProfile.MacroValue = Value\r
+ AllMacroList.append(MacProfile)\r
+ self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
\r
elif self.__Token in ('!ifdef', '!ifndef', '!if'):\r
IfStartPos = (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len(self.__Token))\r
IfList.append([IfStartPos, None, None])\r
CondLabel = self.__Token\r
-\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\r
+ \r
+ MacroName, NotFlag = self.__GetMacroName() \r
NotDefineFlag = False\r
if CondLabel == '!ifndef':\r
NotDefineFlag = True\r
self.__WipeOffArea.append((IfList[-1][0], ElseStartPos))\r
IfList[-1] = [ElseStartPos, True, IfList[-1][2]]\r
if self.__Token == '!elseif':\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\r
+ MacroName, NotFlag = self.__GetMacroName() \r
if not self.__GetNextOp():\r
raise Warning("expected !endif", self.FileName, self.CurrentLineNumber)\r
\r
raise Warning("Value %s is not a number", self.FileName, Line)\r
\r
for Profile in AllMacroList:\r
- if Profile.FileName == FileLineTuple[0] and Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
+ if Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
if Op == None:\r
if Value == 'Bool' and Profile.MacroValue == None or Profile.MacroValue.upper() == 'FALSE':\r
return False\r
raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
\r
while self.__GetNextWord():\r
+ # handle the SET statement\r
+ if self.__Token == 'SET':\r
+ self.__UndoToken()\r
+ self.__GetSetStatement(None)\r
+ continue\r
+ \r
Macro = self.__Token\r
\r
if not self.__IsToken("="):\r
raise Warning("expected [FD.]", self.FileName, self.CurrentLineNumber)\r
\r
FdName = self.__GetUiName()\r
+ if FdName == "":\r
+ if len (self.Profile.FdDict) == 0:\r
+ FdName = GenFdsGlobalVariable.PlatformName\r
+ self.Profile.FdNameNotSet = True\r
+ else:\r
+ raise Warning("expected FdName in [FD.] section", self.FileName, self.CurrentLineNumber)\r
self.CurrentFdName = FdName.upper()\r
+ \r
+ if self.CurrentFdName in self.Profile.FdDict:\r
+ raise Warning("Unexpected the same FD name", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken( "]"):\r
raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
FdObj = Fd.FD()\r
FdObj.FdUiName = self.CurrentFdName\r
self.Profile.FdDict[self.CurrentFdName] = FdObj\r
+\r
+ if len (self.Profile.FdDict) > 1 and self.Profile.FdNameNotSet:\r
+ raise Warning("expected all FDs have their name", self.FileName, self.CurrentLineNumber)\r
+\r
Status = self.__GetCreateFile(FdObj)\r
if not Status:\r
raise Warning("FD name error", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetTokenStatements(FdObj):\r
- return False\r
+ self.__GetTokenStatements(FdObj)\r
\r
self.__GetDefineStatements(FdObj)\r
\r
#\r
# @param self The object pointer\r
# @param Obj for whom token statement is got\r
- # @retval True Successfully find a token statement\r
- # @retval False Not able to find a token statement\r
#\r
def __GetTokenStatements(self, Obj):\r
if not self.__IsKeyword( "BaseAddress"):\r
\r
Obj.ErasePolarity = self.__Token\r
\r
- Status = self.__GetBlockStatements(Obj)\r
- return Status\r
+ self.__GetBlockStatements(Obj)\r
\r
## __GetAddressStatements() method\r
#\r
#\r
# @param self The object pointer\r
# @param Obj for whom block statement is got\r
- # @retval True Successfully find\r
- # @retval False Not able to find\r
#\r
def __GetBlockStatements(self, Obj):\r
\r
if not self.__GetBlockStatement(Obj):\r
- raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
+ #set default block size is 1\r
+ Obj.BlockSizeList.append((1, Obj.Size, None))\r
+ return\r
\r
while self.__GetBlockStatement(Obj):\r
pass\r
- return True\r
+ \r
+ for Item in Obj.BlockSizeList:\r
+ if Item[0] == None or Item[1] == None:\r
+ raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
\r
## __GetBlockStatement() method\r
#\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
- raise Warning("expected Hex block size", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected Hex or Integer block size", self.FileName, self.CurrentLineNumber)\r
\r
BlockSize = self.__Token\r
BlockSizePcd = None\r
PcdPair = self.__GetNextPcdName()\r
BlockSizePcd = PcdPair\r
self.Profile.PcdDict[PcdPair] = BlockSize\r
- BlockSize = long(self.__Token, 0)\r
+ BlockSize = long(BlockSize, 0)\r
\r
BlockNumber = None\r
if self.__IsKeyword( "NumBlocks"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
Value += self.__SkippedChars\r
\r
- Obj.SetVarDict[PcdPair] = Value\r
+ if Obj:\r
+ Obj.SetVarDict[PcdPair] = Value\r
self.Profile.PcdDict[PcdPair] = Value\r
return True\r
\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 18:\r
+ raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
\r
- DataString = self.__Token\r
- DataString += ","\r
+ # convert hex string value to byte hex string array\r
+ AllString = self.__Token\r
+ AllStrLen = len (AllString)\r
+ DataString = ""\r
+ while AllStrLen > 4:\r
+ DataString = DataString + "0x" + AllString[AllStrLen - 2: AllStrLen] + ","\r
+ AllStrLen = AllStrLen - 2\r
+ DataString = DataString + AllString[:AllStrLen] + ","\r
\r
- while self.__IsToken(","):\r
- if not self.__GetNextHexNumber():\r
- raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
- DataString += self.__Token\r
- DataString += ","\r
+ # byte value array\r
+ if len (self.__Token) <= 4:\r
+ while self.__IsToken(","):\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 4:\r
+ raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+ DataString += self.__Token\r
+ DataString += ","\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
-\r
- DataString = self.__Token\r
- DataString += ","\r
-\r
- while self.__IsToken(","):\r
- self.__GetNextHexNumber()\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
- DataString += self.__Token\r
- DataString += ","\r
+ if len(self.__Token) > 18:\r
+ raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
+\r
+ # convert hex string value to byte hex string array\r
+ AllString = self.__Token\r
+ AllStrLen = len (AllString)\r
+ DataString = ""\r
+ while AllStrLen > 4:\r
+ DataString = DataString + "0x" + AllString[AllStrLen - 2: AllStrLen] + ","\r
+ AllStrLen = AllStrLen - 2\r
+ DataString = DataString + AllString[:AllStrLen] + ","\r
+\r
+ # byte value array\r
+ if len (self.__Token) <= 4:\r
+ while self.__IsToken(","):\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 4:\r
+ raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+ DataString += self.__Token\r
+ DataString += ","\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
\r
self.__GetAddressStatements(FvObj)\r
\r
- self.__GetBlockStatement(FvObj)\r
+ while self.__GetBlockStatement(FvObj):\r
+ pass\r
\r
self.__GetSetStatements(FvObj)\r
\r
\r
self.__GetFvNameGuid(FvObj)\r
\r
+ FvObj.FvExtEntryTypeValue = []\r
+ FvObj.FvExtEntryType = []\r
+ FvObj.FvExtEntryData = []\r
+ while True:\r
+ isFvExtEntry = self.__GetFvExtEntryStatement(FvObj)\r
+ if not isFvExtEntry:\r
+ break\r
+\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
\r
\r
return\r
\r
+ def __GetFvExtEntryStatement(self, FvObj):\r
+\r
+ if not self.__IsKeyword( "FV_EXT_ENTRY"):\r
+ return False\r
+\r
+ if not self.__IsKeyword ("TYPE"):\r
+ raise Warning("expected 'TYPE'", self.FileName, self.CurrentLineNumber)\r
+ \r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
+ raise Warning("expected Hex FV extension entry type value At Line ", self.FileName, self.CurrentLineNumber)\r
+\r
+ FvObj.FvExtEntryTypeValue += [self.__Token]\r
+\r
+ if not self.__IsToken( "{"):\r
+ raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__IsKeyword ("FILE") and not self.__IsKeyword ("DATA"):\r
+ raise Warning("expected 'FILE' or 'DATA'", self.FileName, self.CurrentLineNumber)\r
+\r
+ FvObj.FvExtEntryType += [self.__Token]\r
+\r
+ if self.__Token == 'DATA':\r
+\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ \r
+ if not self.__IsToken( "{"):\r
+ raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
+\r
+ if len(self.__Token) > 4:\r
+ raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+\r
+ DataString = self.__Token\r
+ DataString += ","\r
+\r
+ while self.__IsToken(","):\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 4:\r
+ raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+ DataString += self.__Token\r
+ DataString += ","\r
+\r
+ if not self.__IsToken( "}"):\r
+ raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__IsToken( "}"):\r
+ raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+ DataString = DataString.rstrip(",")\r
+ FvObj.FvExtEntryData += [DataString]\r
+\r
+ if self.__Token == 'FILE':\r
+ \r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ \r
+ if not self.__GetNextToken():\r
+ raise Warning("expected FV Extension Entry file path At Line ", self.FileName, self.CurrentLineNumber)\r
+ \r
+ FvObj.FvExtEntryData += [self.__Token]\r
+\r
+ if not self.__IsToken( "}"):\r
+ raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+ return True\r
+\r
## __GetAprioriSection() method\r
#\r
# Get token statements\r
if not self.__GetNextToken():\r
raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self.__Token\r
-\r
-# if ffsInf.InfFileName.find('$') >= 0:\r
-# ffsInf.InfFileName = GenFdsGlobalVariable.GenFdsGlobalVariable.MacroExtend(ffsInf.InfFileName, MacroDict)\r
+ if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #do case sensitive check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not ffsInf.InfFileName in self.Profile.InfList:\r
self.Profile.InfList.append(ffsInf.InfFileName)\r
self.__GetSectionData( FfsFileObj, MacroDict)\r
else:\r
FfsFileObj.FileName = self.__Token\r
+ if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #do case sensitive check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.CheckSum = True\r
\r
if self.__GetAlignment():\r
- FfsFileObj.Alignment = self.__Token\r
-\r
-\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
+ #For FFS, Auto is default option same to ""\r
+ if not self.__Token == "Auto":\r
+ FfsFileObj.Alignment = self.__Token\r
\r
## __GetAlignment() method\r
#\r
\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 = self.__Token\r
\r
BuildNum = None\r
BuildNum = self.__Token\r
\r
if self.__IsKeyword( "VERSION"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
else:\r
VerSectionObj.FileName = self.__Token\r
Obj.SectionList.append(VerSectionObj)\r
-\r
+ \r
elif self.__IsKeyword( "UI"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(UiSectionObj)\r
\r
elif self.__IsKeyword( "FV_IMAGE"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(FvImageSectionObj)\r
\r
elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP") or self.__IsKeyword("SMM_DEPEX_EXP"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
DepexSectionObj = DepexSection.DepexSection()\r
DepexSectionObj.Alignment = AlignValue\r
DepexSectionObj.DepexType = self.__Token\r
Obj.SectionList.append(DepexSectionObj)\r
\r
else:\r
-\r
if not self.__GetNextWord():\r
raise Warning("expected section type", self.FileName, self.CurrentLineNumber)\r
\r
if self.__Token not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
"UI", "VERSION", "PEI_DEPEX", "SUBTYPE_GUID", "SMM_DEPEX"):\r
raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
+\r
# DataSection\r
DataSectionObj = DataSection.DataSection()\r
DataSectionObj.Alignment = AlignValue\r
if not self.__GetNextToken():\r
raise Warning("expected section file path", self.FileName, self.CurrentLineNumber)\r
DataSectionObj.SectFileName = self.__Token\r
+ if DataSectionObj.SectFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #do case sensitive check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(DataSectionObj.SectFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
else:\r
if not self.__GetCglSection(DataSectionObj):\r
return False\r
def __GetGuidAttrib(self):\r
\r
AttribDict = {}\r
- AttribDict["PROCESSING_REQUIRED"] = False\r
- AttribDict["AUTH_STATUS_VALID"] = False\r
+ AttribDict["PROCESSING_REQUIRED"] = "NONE"\r
+ AttribDict["AUTH_STATUS_VALID"] = "NONE"\r
if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
AttribKey = self.__Token\r
\r
\r
AlignValue = None\r
if self.__GetAlignment():\r
+ if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
if not self.__GetCglSection(FfsFileObj, AlignValue):\r
# @param Obj for whom token statements are got\r
#\r
def __GetCapsuleTokens(self, Obj):\r
-\r
- if not self.__IsKeyword("CAPSULE_GUID"):\r
- raise Warning("expected 'CAPSULE_GUID'", self.FileName, self.CurrentLineNumber)\r
-\r
- while self.__CurrentLine().find("=") != -1:\r
- NameValue = self.__CurrentLine().split("=")\r
- Obj.TokensDict[NameValue[0].strip()] = NameValue[1].strip()\r
- self.CurrentLineNumber += 1\r
- self.CurrentOffsetWithinLine = 0\r
+ if not self.__GetNextToken():\r
+ return False\r
+ while self.__Token in ("CAPSULE_GUID", "CAPSULE_HEADER_SIZE", "CAPSULE_FLAGS"):\r
+ Name = self.__Token.strip()\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ if Name == 'CAPSULE_FLAGS':\r
+ if not self.__Token in ("PersistAcrossReset", "PopulateSystemTable", "InitiateReset"):\r
+ raise Warning("expected PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
+ Value = self.__Token.strip()\r
+ while self.__IsToken(","):\r
+ Value += ','\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ if not self.__Token in ("PersistAcrossReset", "PopulateSystemTable", "InitiateReset"):\r
+ raise Warning("expected PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
+ Value += self.__Token.strip()\r
+ else:\r
+ Value = self.__Token.strip()\r
+ Obj.TokensDict[Name] = Value \r
+ if not self.__GetNextToken():\r
+ return False\r
+ self.__UndoToken()\r
\r
## __GetCapsuleData() method\r
#\r
"DXE_SMM_DRIVER", "DXE_RUNTIME_DRIVER", \\r
"UEFI_DRIVER", "UEFI_APPLICATION", "USER_DEFINED", "DEFAULT", "BASE", \\r
"SECURITY_CORE", "COMBINED_PEIM_DRIVER", "PIC_PEIM", "RELOCATABLE_PEIM", \\r
- "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_DRIVER", "SMM_CORE"):\r
+ "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE"):\r
raise Warning("Unknown Module type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
return self.__Token\r
\r
\r
Type = self.__Token.strip().upper()\r
if Type not in ("RAW", "FREEFORM", "SEC", "PEI_CORE", "PEIM",\\r
- "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM_DXE_COMBO", "SMM", "SMM_CORE"):\r
+ "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM", "SMM_CORE"):\r
raise Warning("Unknown FV type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken("="):\r
\r
AlignValue = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\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 = self.__Token\r
+ #For FFS, Auto is default option same to ""\r
+ if not self.__Token == "Auto":\r
+ AlignValue = self.__Token\r
\r
if self.__IsToken("{"):\r
# Complex file rule expected\r
\r
return Rule\r
\r
- elif self.__IsToken("|"):\r
- # Ext rule expected\r
- Ext = self.__GetFileExtension()\r
-\r
- Rule = RuleSimpleFile.RuleSimpleFile()\r
-\r
- Rule.FvFileType = Type\r
- Rule.NameGuid = NameGuid\r
- Rule.Alignment = AlignValue\r
- Rule.CheckSum = CheckSum\r
- Rule.Fixed = Fixed\r
- Rule.FileExtension = Ext\r
- Rule.KeyStringList = KeyStringList\r
- if KeepReloc != None:\r
- Rule.KeepReloc = KeepReloc\r
-\r
- return Rule\r
-\r
else:\r
# Simple file rule expected\r
if not self.__GetNextWord():\r
if self.__IsKeyword("CheckSum", True):\r
CheckSum = True\r
\r
+ SectAlignment = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\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 = self.__Token\r
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
+ SectAlignment = self.__Token\r
\r
- if not self.__GetNextToken():\r
+ Ext = None\r
+ if self.__IsToken('|'):\r
+ Ext = self.__GetFileExtension()\r
+ elif not self.__GetNextToken():\r
raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
\r
Rule = RuleSimpleFile.RuleSimpleFile()\r
Rule.FvFileType = Type\r
Rule.NameGuid = NameGuid\r
Rule.Alignment = AlignValue\r
+ Rule.SectAlignment = SectAlignment\r
Rule.CheckSum = CheckSum\r
Rule.Fixed = Fixed\r
- Rule.FileName = self.__Token\r
Rule.KeyStringList = KeyStringList\r
if KeepReloc != None:\r
Rule.KeepReloc = KeepReloc\r
+ Rule.FileExtension = Ext\r
+ Rule.FileName = self.__Token\r
return Rule\r
\r
## __GetEfiSection() method\r
raise Warning("expected 'FV'", self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.FvFileType = self.__Token\r
\r
- if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
- raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- FvImageSectionObj.Alignment = self.__Token\r
-\r
- if self.__IsKeyword("FV"):\r
- FvImageSectionObj.FvFileType = self.__Token\r
-\r
if self.__GetAlignment():\r
if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.BuildNum = self.__Token\r
\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
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.Alignment = self.__Token\r
\r
if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r
elif SectionType == "RAW":\r
if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "DXE_DEPEX":\r
- if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX"):\r
+ elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":\r
+ if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == "UI":\r
if FileType not in ("UI", "SEC_UI"):\r
raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)\r
\r
VtfObj.ResetBin = self.__Token\r
+ if VtfObj.ResetBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
while self.__GetComponentStatement(VtfObj):\r
pass\r
raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompBin = self.__Token\r
+ if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self.__IsKeyword("COMP_SYM"):\r
raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)\r
raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompSym = self.__Token\r
+ if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self.__IsKeyword("COMP_SIZE"):\r
raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self.__Token\r
+ if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not ffsInf.InfFileName in self.Profile.InfList:\r
self.Profile.InfList.append(ffsInf.InfFileName)\r
if not self.__GetNextToken():\r
raise Warning("expected File path", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FileName = self.__Token\r
+ if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if FfsFileObj.FileType == 'EFI':\r
self.__GetOptRomOverrides(FfsFileObj)\r