if fvname.upper() not in self.FdfProfile.FvDict:\r
EdkLogger.error("build", OPTION_VALUE_INVALID,\r
"No such an FV in FDF file: %s" % fvname)\r
+\r
+ for key in self.FdfProfile.InfDict:\r
+ if key == 'ArchTBD':\r
+ Platform_cache = {}\r
+ for Arch in self.ArchList:\r
+ Platform_cache[Arch] = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
+ for Inf in self.FdfProfile.InfDict[key]:\r
+ ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)\r
+ for Arch in self.ArchList:\r
+ if ModuleFile in Platform_cache[Arch].Modules:\r
+ break\r
+ else:\r
+ ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]\r
+ if not ModuleData.IsBinaryModule:\r
+ EdkLogger.error('build', PARSER_ERROR, "Module %s NOT found in DSC file; Is it really a binary module?" % ModuleFile)\r
+\r
+ else:\r
+ for Arch in self.ArchList:\r
+ if Arch == key:\r
+ Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
+ for Inf in self.FdfProfile.InfDict[key]:\r
+ ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)\r
+ if ModuleFile in Platform.Modules:\r
+ continue\r
+ ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]\r
+ if not ModuleData.IsBinaryModule:\r
+ EdkLogger.error('build', PARSER_ERROR, "Module %s NOT found in DSC file; Is it really a binary module?" % ModuleFile)\r
+\r
else:\r
PcdSet = {}\r
ModuleList = []\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.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
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