diff options
| author | Fan, ZhijuX <zhijux.fan@intel.com> | 2019-05-29 13:29:34 +0800 |
|---|---|---|
| committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-06-10 19:48:50 +0800 |
| commit | 04797875d1d53e53e31eca4fa01bc3cf6929f39c (patch) | |
| tree | 4bdf17a9e6204e220b006499002f53587bd8bfc8 /BaseTools/Source/Python/GenFds/EfiSection.py | |
| parent | 6cbed0e36fe734f3fc11d30d652122d7714627c4 (diff) | |
| download | edk2-04797875d1d53e53e31eca4fa01bc3cf6929f39c.tar.gz edk2-04797875d1d53e53e31eca4fa01bc3cf6929f39c.tar.bz2 edk2-04797875d1d53e53e31eca4fa01bc3cf6929f39c.zip | |
BaseTools:Make BaseTools support new rules to generate RAW FFS FILE
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1765
If RAW FFS File Rule has no section for its data.For RAW FFS File,
directly call GenFfs tool to generate FFS file.
Ffs Rule:
[Rule.Common.USER_DEFINED.MicroCode]
FILE RAW = $(NAMED_GUID) {
$(INF_OUTPUT)/$(MODULE_NAME).bin
}
[Rule.Common.USER_DEFINED.LOGO]
FILE RAW = $(NAMED_GUID) {
|.bmp
}
As shown in the rule above,if SectionType and FileType not defined,
FFS files are generated directly, and no other type of file is
generated.
The patch is to make the BaseTools support these two rules
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/GenFds/EfiSection.py')
| -rw-r--r-- | BaseTools/Source/Python/GenFds/EfiSection.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py index 302f244faf..74f176cfef 100644 --- a/BaseTools/Source/Python/GenFds/EfiSection.py +++ b/BaseTools/Source/Python/GenFds/EfiSection.py @@ -93,7 +93,7 @@ class EfiSection (EfiSectionClassObject): if '.depex' in SuffixMap:
FileList.append(Filename)
else:
- FileList, IsSect = Section.Section.GetFileList(FfsInf, self.FileType, self.FileExtension, Dict, IsMakefile=IsMakefile)
+ FileList, IsSect = Section.Section.GetFileList(FfsInf, self.FileType, self.FileExtension, Dict, IsMakefile=IsMakefile, SectionType=SectionType)
if IsSect :
return FileList, self.Alignment
@@ -217,6 +217,26 @@ class EfiSection (EfiSectionClassObject): Ui=StringData, IsMakefile=IsMakefile)
OutputFileList.append(OutputFile)
+ #
+ # If Section Type is BINARY_FILE_TYPE_RAW
+ #
+ elif SectionType == BINARY_FILE_TYPE_RAW:
+ """If File List is empty"""
+ if FileList == []:
+ if self.Optional == True:
+ GenFdsGlobalVariable.VerboseLogger("Optional Section don't exist!")
+ return [], None
+ else:
+ EdkLogger.error("GenFds", GENFDS_ERROR, "Output file for %s section could not be found for %s" % (SectionType, InfFileName))
+
+ elif len(FileList) > 1:
+ EdkLogger.error("GenFds", GENFDS_ERROR,
+ "Files suffixed with %s are not allowed to have more than one file in %s[Binaries] section" % (
+ self.FileExtension, InfFileName))
+ else:
+ for File in FileList:
+ File = GenFdsGlobalVariable.MacroExtend(File, Dict)
+ OutputFileList.append(File)
else:
"""If File List is empty"""
|