BaseTools: Fix a bug for different FV use same FILE statement Guid

We meet a case that different FV use same FILE statement Guid, but the
FILE content is different. current we use the Guid value as Ffs file
dir which cause the ffs file will be override. This patch use Guid
value and Fv name as ffs dir for FILE statement.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
index edb131266d98d1b6ac5e41872809a3293bb7f514..12ec95b5650163a9b240e4b3e4e9077907987478 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
@@ -57,7 +57,7 @@ class FileStatement (FileStatementClassObject) :
     #   @param  FvParentAddr Parent Fv base address\r
     #   @retval string       Generated FFS file name\r
     #\r
     #   @param  FvParentAddr Parent Fv base address\r
     #   @retval string       Generated FFS file name\r
     #\r

-    def GenFfs(self, Dict = {}, FvChildAddr=[], FvParentAddr=None, IsMakefile=False):\r
+    def GenFfs(self, Dict = {}, FvChildAddr=[], FvParentAddr=None, IsMakefile=False, FvName=None):\r

         \r
         if self.NameGuid != None and self.NameGuid.startswith('PCD('):\r
             PcdValue = GenFdsGlobalVariable.GetPcdValue(self.NameGuid)\r
         \r
         if self.NameGuid != None and self.NameGuid.startswith('PCD('):\r
             PcdValue = GenFdsGlobalVariable.GetPcdValue(self.NameGuid)\r


@@ -72,7 +72,10 @@ class FileStatement (FileStatementClassObject) :
                             % (self.NameGuid))\r
             self.NameGuid = RegistryGuidStr\r
         \r
                             % (self.NameGuid))\r
             self.NameGuid = RegistryGuidStr\r
         \r

-        OutputDir = os.path.join(GenFdsGlobalVariable.FfsDir, self.NameGuid)\r
+        Str = self.NameGuid\r
+        if FvName:\r
+            Str += FvName\r
+        OutputDir = os.path.join(GenFdsGlobalVariable.FfsDir, Str)\r

         if not os.path.exists(OutputDir):\r
             os.makedirs(OutputDir)\r
 \r
         if not os.path.exists(OutputDir):\r
             os.makedirs(OutputDir)\r
 \r

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index 4b4781755dd41fb0199199a8e73109f5a93b0bde..baee543698520702ab851d123d986cfcdca85063 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -422,7 +422,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
     #   @param  FvParentAddr Parent Fv base address\r
     #   @retval string       Generated FFS file name\r
     #\r
     #   @param  FvParentAddr Parent Fv base address\r
     #   @retval string       Generated FFS file name\r
     #\r

-    def GenFfs(self, Dict = {}, FvChildAddr = [], FvParentAddr=None, IsMakefile=False):\r
+    def GenFfs(self, Dict = {}, FvChildAddr = [], FvParentAddr=None, IsMakefile=False, FvName=None):\r

         #\r
         # Parse Inf file get Module related information\r
         #\r
         #\r
         # Parse Inf file get Module related information\r
         #\r

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index d5922c040cd30e39e5468e659576905e8ecbba30..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
                     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
             FfsFileList.append(FileName)\r
             if not Flag:\r
                 self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r