from Common.String import *\r
from Common.Misc import PathClass\r
from Common.Misc import GuidStructureByteArrayToGuidString\r
+from Common.Misc import ProcessDuplicatedInf\r
from Common import EdkLogger\r
from Common.BuildToolError import *\r
from GuidSection import GuidSection\r
self.CurrentLineContent = None\r
self.FileName = None\r
self.InfFileName = None\r
+ self.OverrideGuid = None\r
+ self.PatchedBinFile = ''\r
\r
## GetFinalTargetSuffixMap() method\r
#\r
GenFdsGlobalVariable.VerboseLogger( " Begine parsing INf file : %s" %self.InfFileName)\r
\r
self.InfFileName = self.InfFileName.replace('$(WORKSPACE)', '')\r
- if self.InfFileName[0] == '\\' or self.InfFileName[0] == '/' :\r
+ if len(self.InfFileName) > 1 and self.InfFileName[0] == '\\' and self.InfFileName[1] == '\\':\r
+ pass\r
+ elif self.InfFileName[0] == '\\' or self.InfFileName[0] == '/' :\r
self.InfFileName = self.InfFileName[1:]\r
\r
if self.InfFileName.find('$') == -1:\r
ErrorCode, ErrorInfo = PathClassObj.Validate(".inf")\r
if ErrorCode != 0:\r
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
- \r
+\r
+ if self.OverrideGuid:\r
+ PathClassObj = ProcessDuplicatedInf(PathClassObj, self.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir)\r
if self.CurrentArch != None:\r
\r
Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClassObj, self.CurrentArch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
"INF %s specified in FDF could not be found in build ARCH %s!" \\r
% (self.InfFileName, GenFdsGlobalVariable.ArchList))\r
\r
+ if self.OverrideGuid:\r
+ self.ModuleGuid = self.OverrideGuid\r
+\r
if len(self.SourceFileList) != 0 and not self.InDsc:\r
EdkLogger.warn("GenFds", GENFDS_ERROR, "Module %s NOT found in DSC file; Is it really a binary module?" % (self.InfFileName))\r
\r
or PcdValueInImg > FfsInfStatement._MAX_SIZE_TYPE[Pcd.DatumType]:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "The size of %s type PCD '%s.%s' doesn't match its data type." \\r
% (Pcd.DatumType, Pcd.TokenSpaceGuidCName, Pcd.TokenCName))\r
- Pcd.DefaultValue = DefaultValue\r
- self.PatchPcds.append(Pcd)\r
+ self.PatchPcds.append((Pcd, DefaultValue))\r
+\r
self.InfModule = Inf\r
self.PcdIsDriver = Inf.PcdIsDriver\r
self.IsBinaryModule = Inf.IsBinaryModule\r
self.EfiOutputPath = self.__GetEFIOutPutPath__()\r
GenFdsGlobalVariable.VerboseLogger( "ModuelEFIPath: " + self.EfiOutputPath)\r
\r
-## PatchEfiFile\r
+ ## PatchEfiFile\r
#\r
# Patch EFI file with patch PCD\r
#\r
# @retval: Full path of patched EFI file: self.OutputPath + EfiFile base name\r
# If passed in file does not end with efi, return as is\r
#\r
- def PatchEfiFile(self, EfiFile):\r
- if os.path.splitext(EfiFile)[1].lower() != '.efi':\r
- return EfiFile\r
+ def PatchEfiFile(self, EfiFile, FileType):\r
if not self.PatchPcds:\r
return EfiFile\r
+ if FileType != 'PE32' and self.ModuleType != "USER_DEFINED":\r
+ return EfiFile\r
+ if self.PatchedBinFile:\r
+ EdkLogger.error("GenFds", GENFDS_ERROR,\r
+ 'Only one binary file can be patched:\n'\r
+ ' a binary file has been patched: %s\n'\r
+ ' current file: %s' % (self.PatchedBinFile, EfiFile),\r
+ File=self.InfFileName)\r
Basename = os.path.basename(EfiFile)\r
Output = os.path.join(self.OutputPath, Basename)\r
CopyLongFilePath(EfiFile, Output)\r
- for Pcd in self.PatchPcds:\r
- RetVal, RetStr = PatchBinaryFile(Output, int(Pcd.Offset, 0), Pcd.DatumType, Pcd.DefaultValue, Pcd.MaxDatumSize)\r
+ for Pcd, Value in self.PatchPcds:\r
+ RetVal, RetStr = PatchBinaryFile(Output, int(Pcd.Offset, 0), Pcd.DatumType, Value, Pcd.MaxDatumSize)\r
if RetVal:\r
EdkLogger.error("GenFds", GENFDS_ERROR, RetStr, File=self.InfFileName)\r
+ self.PatchedBinFile = os.path.normpath(EfiFile)\r
return Output\r
## GenFfs() method\r
#\r
#\r
# Allow binary type module not specify override rule in FDF file.\r
# \r
- if len(self.BinFileList) >0 and not self.InDsc:\r
+ if len(self.BinFileList) > 0:\r
if self.Rule == None or self.Rule == "":\r
self.Rule = "BINARY"\r
\r
(ModulePath, FileName) = os.path.split(self.InfFileName)\r
Index = FileName.rfind('.')\r
FileName = FileName[0:Index]\r
+ if self.OverrideGuid:\r
+ FileName = self.OverrideGuid\r
Arch = "NoneArch"\r
if self.CurrentArch != None:\r
Arch = self.CurrentArch\r