@@ -128,11+121,11 @@ class Section (SectionClassObject):
FileList = []\r
if FileType is not None:\r
for File in FfsInf.BinFileList:\r
FileList = []\r
if FileType is not None:\r
for File in FfsInf.BinFileList:\r
- if File.Arch == "COMMON" or FfsInf.CurrentArch == File.Arch:\r
+ if File.Arch == TAB_ARCH_COMMON or FfsInf.CurrentArch == File.Arch:\r
if File.Type == FileType or (int(FfsInf.PiSpecVersion, 16) >= 0x0001000A \\r
if File.Type == FileType or (int(FfsInf.PiSpecVersion, 16) >= 0x0001000A \\r
- and FileType == 'DXE_DPEX'and File.Type == 'SMM_DEPEX') \\r
- or (FileType == 'TE'and File.Type == 'PE32'):\r
- if '*' in FfsInf.TargetOverrideList or File.Target == '*' or File.Target in FfsInf.TargetOverrideList or FfsInf.TargetOverrideList == []:\r
+ and FileType == 'DXE_DPEX' and File.Type == BINARY_FILE_TYPE_SMM_DEPEX) \\r
+ or (FileType == BINARY_FILE_TYPE_TE and File.Type == BINARY_FILE_TYPE_PE32):\r
+ if TAB_STAR in FfsInf.TargetOverrideList or File.Target == TAB_STAR or File.Target in FfsInf.TargetOverrideList or FfsInf.TargetOverrideList == []:\r
GenFdsGlobalVariable.InfLogger ("\nBuild Target \'%s\' of File %s is not in the Scope of %s specified by INF %s in FDF" %(File.Target, File.File, FfsInf.TargetOverrideList, FfsInf.InfFileName))\r
GenFdsGlobalVariable.InfLogger ("\nBuild Target \'%s\' of File %s is not in the Scope of %s specified by INF %s in FDF" %(File.Target, File.File, FfsInf.TargetOverrideList, FfsInf.InfFileName))\r
@@ -141,6+134,11 @@ class Section (SectionClassObject):
else:\r
GenFdsGlobalVariable.InfLogger ("\nCurrent ARCH \'%s\' of File %s is not in the Support Arch Scope of %s specified by INF %s in FDF" %(FfsInf.CurrentArch, File.File, File.Arch, FfsInf.InfFileName))\r
\r
else:\r
GenFdsGlobalVariable.InfLogger ("\nCurrent ARCH \'%s\' of File %s is not in the Support Arch Scope of %s specified by INF %s in FDF" %(FfsInf.CurrentArch, File.File, File.Arch, FfsInf.InfFileName))\r
\r
+ elif FileType is None and SectionType == BINARY_FILE_TYPE_RAW:\r
+ for File in FfsInf.BinFileList:\r
+ if File.Ext == Suffix:\r
+ FileList.append(File.Path)\r
+\r
if (not IsMakefile and Suffix is not None and os.path.exists(FfsInf.EfiOutputPath)) or (IsMakefile and Suffix is not None):\r
#\r
# Get Makefile path and time stamp\r
if (not IsMakefile and Suffix is not None and os.path.exists(FfsInf.EfiOutputPath)) or (IsMakefile and Suffix is not None):\r
#\r
# Get Makefile path and time stamp\r
@@ -162,7+160,7 @@ class Section (SectionClassObject):
SuffixMap = FfsInf.GetFinalTargetSuffixMap()\r
if Suffix in SuffixMap:\r
FileList.extend(SuffixMap[Suffix])\r
SuffixMap = FfsInf.GetFinalTargetSuffixMap()\r
if Suffix in SuffixMap:\r
FileList.extend(SuffixMap[Suffix])\r
- \r
+\r
#Process the file lists is alphabetical for a same section type\r
if len (FileList) > 1:\r
FileList.sort()\r
#Process the file lists is alphabetical for a same section type\r