BaseTools: resolve initialization order errors in VfrFormPkg.h

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Fv.py

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 3953756e0f8fb3e489fa66b650bd784707826a8e..a69abb300cfa10d66117c7b93c62bb72216e04d6 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -121,7 +121,7 @@ class FV (FvClassObject):
                     continue\r
             if GenFdsGlobalVariable.EnableGenfdsMultiThread and GenFdsGlobalVariable.ModuleFile and GenFdsGlobalVariable.ModuleFile.Path.find(os.path.normpath(FfsFile.InfFileName)) == -1:\r
                 continue\r
-            FileName = FfsFile.GenFfs(MacroDict, FvParentAddr=BaseAddress, IsMakefile=Flag)\r
+            FileName = FfsFile.GenFfs(MacroDict, FvParentAddr=BaseAddress, IsMakefile=Flag, FvName=self.UiFvName)\r
             FfsFileList.append(FileName)\r
             if not Flag:\r
                 self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r
@@ -184,7 +184,7 @@ class FV (FvClassObject):
                     if GenFdsGlobalVariable.LargeFileInFvFlags[-1]:\r
                         FFSGuid = GenFdsGlobalVariable.EFI_FIRMWARE_FILE_SYSTEM3_GUID;\r
                     #Update GenFv again\r
-                        GenFdsGlobalVariable.GenerateFirmwareVolume(\r
+                    GenFdsGlobalVariable.GenerateFirmwareVolume(\r
                                                 FvOutputFile,\r
                                                 [self.InfFileName],\r
                                                 AddressFile=FvInfoFileName,\r