diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-01-02 18:19:36 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-01-04 13:40:25 +0800 |
| commit | db269dae169ad8bcd5008501d68ad4da0de21bbe (patch) | |
| tree | 1d6a6e91dcf9f025e63d6ef7ce7a55b785d377b5 | |
| parent | e4a45bb8b2cdb3539545be145585c945e6126b14 (diff) | |
| download | edk2-db269dae169ad8bcd5008501d68ad4da0de21bbe.tar.gz edk2-db269dae169ad8bcd5008501d68ad4da0de21bbe.tar.bz2 edk2-db269dae169ad8bcd5008501d68ad4da0de21bbe.zip | |
BaseTools: Fix the regression bug of a74398 for SubFv Image
in version a74398 we use guid value and Fv name as ffs dir for FILE
statement, this patch apply this rule on subFv image.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit ff260aa7abbeefdea591bb0b15e7d89e73d6c334)
| -rw-r--r-- | BaseTools/Source/Python/GenFds/Fv.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py index a69abb300c..c0b869d250 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -1,7 +1,7 @@ ## @file
# process FV generation
#
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -179,7 +179,7 @@ class FV (FvClassObject): if FvChildAddr != []:
# Update Ffs again
for FfsFile in self.FfsList :
- FileName = FfsFile.GenFfs(MacroDict, FvChildAddr, BaseAddress, IsMakefile=Flag)
+ FileName = FfsFile.GenFfs(MacroDict, FvChildAddr, BaseAddress, IsMakefile=Flag, FvName=self.UiFvName)
if GenFdsGlobalVariable.LargeFileInFvFlags[-1]:
FFSGuid = GenFdsGlobalVariable.EFI_FIRMWARE_FILE_SYSTEM3_GUID;
|