BaseTools: Fix a bug for different FV use same FILE statement Guid
authorYonghong Zhu <yonghong.zhu@intel.com>
Thu, 28 Dec 2017 17:40:54 +0000 (01:40 +0800)
committerLiming Gao <liming.gao@intel.com>
Fri, 29 Dec 2017 03:07:50 +0000 (11:07 +0800)
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>
BaseTools/Source/Python/GenFds/FfsFileStatement.py
BaseTools/Source/Python/GenFds/FfsInfStatement.py
BaseTools/Source/Python/GenFds/Fv.py

index edb1312..12ec95b 100644 (file)
@@ -57,7 +57,7 @@ class FileStatement (FileStatementClassObject) :
     #   @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
@@ -72,7 +72,10 @@ class FileStatement (FileStatementClassObject) :
                             % (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
index 4b47817..baee543 100644 (file)
@@ -422,7 +422,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
     #   @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
index d5922c0..a69abb3 100644 (file)
@@ -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