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>
## @file\r
# process FV generation\r
#\r
## @file\r
# process FV generation\r
#\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
if FvChildAddr != []:\r
# Update Ffs again\r
for FfsFile in self.FfsList :\r
if FvChildAddr != []:\r
# Update Ffs again\r
for FfsFile in self.FfsList :\r
- FileName = FfsFile.GenFfs(MacroDict, FvChildAddr, BaseAddress, IsMakefile=Flag)\r
+ FileName = FfsFile.GenFfs(MacroDict, FvChildAddr, BaseAddress, IsMakefile=Flag, FvName=self.UiFvName)\r
\r
if GenFdsGlobalVariable.LargeFileInFvFlags[-1]:\r
FFSGuid = GenFdsGlobalVariable.EFI_FIRMWARE_FILE_SYSTEM3_GUID;\r
\r
if GenFdsGlobalVariable.LargeFileInFvFlags[-1]:\r
FFSGuid = GenFdsGlobalVariable.EFI_FIRMWARE_FILE_SYSTEM3_GUID;\r