BaseTools: Fix GenSec can't found the depex file

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

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index caf8de11e5ba2cae6d44f2e90b53d5650c5cd99e..916ff919176cc00695af6b7bd6ad9c9d68a1897a 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process FV image section generation\r
 #\r
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2017, 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
@@ -50,7 +50,7 @@ class FvImageSection(FvImageSectionClassObject):
     #   @param  Dict        dictionary contains macro and its value\r
     #   @retval tuple       (Generated file name, section alignment)\r
     #\r
-    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}):\r
+    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}, IsMakefile = False):\r
 \r
         OutputFileList = []\r
         if self.FvFileType != None:\r
@@ -60,10 +60,38 @@ class FvImageSection(FvImageSectionClassObject):
 \r
             Num = SecNum\r
 \r
-            for FileName in FileList:\r
+            MaxFvAlignment = 0\r
+            for FvFileName in FileList:\r
+                FvAlignmentValue = 0\r
+                if os.path.isfile(FvFileName):\r
+                    FvFileObj = open (FvFileName,'rb')\r
+                    FvFileObj.seek(0)\r
+                    # PI FvHeader is 0x48 byte\r
+                    FvHeaderBuffer = FvFileObj.read(0x48)\r
+                    # FV alignment position.\r
+                    FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
+                    FvFileObj.close()\r
+                if FvAlignmentValue > MaxFvAlignment:\r
+                    MaxFvAlignment = FvAlignmentValue\r
+\r
                 OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + Num + Ffs.SectionSuffix.get("FV_IMAGE"))\r
-                GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')\r
+                GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE', IsMakefile=IsMakefile)\r
                 OutputFileList.append(OutputFile)\r
+\r
+            # MaxFvAlignment is larger than or equal to 1K\r
+            if MaxFvAlignment >= 0x400:\r
+                if MaxFvAlignment >= 0x100000:\r
+                    #The max alignment supported by FFS is 16M.\r
+                    if MaxFvAlignment >=1000000:\r
+                        self.Alignment = "16M"\r
+                    else:\r
+                        self.Alignment = str(MaxFvAlignment / 0x100000) + "M"\r
+                else:\r
+                    self.Alignment = str (MaxFvAlignment / 0x400) + "K"\r
+            else:\r
+                # MaxFvAlignment is less than 1K\r
+                self.Alignment = str (MaxFvAlignment)\r
+\r
             return OutputFileList, self.Alignment\r
         #\r
         # Generate Fv\r
@@ -73,7 +101,7 @@ class FvImageSection(FvImageSectionClassObject):
             Fv = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName)\r
             if Fv != None:\r
                 self.Fv = Fv\r
-                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict)\r
+                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict, Flag=IsMakefile)\r
                 if Fv.FvAlignment != None:\r
                     if self.Alignment == None:\r
                         self.Alignment = Fv.FvAlignment\r
@@ -83,6 +111,27 @@ class FvImageSection(FvImageSectionClassObject):
             else:\r
                 if self.FvFileName != None:\r
                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)\r
+                    if os.path.isfile(FvFileName):\r
+                        FvFileObj = open (FvFileName,'rb')\r
+                        FvFileObj.seek(0)\r
+                        # PI FvHeader is 0x48 byte\r
+                        FvHeaderBuffer = FvFileObj.read(0x48)\r
+                        # FV alignment position.\r
+                        FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
+                        # FvAlignmentValue is larger than or equal to 1K\r
+                        if FvAlignmentValue >= 0x400:\r
+                            if FvAlignmentValue >= 0x100000:\r
+                                #The max alignment supported by FFS is 16M.\r
+                                if FvAlignmentValue >= 0x1000000:\r
+                                    self.Alignment = "16M"\r
+                                else:\r
+                                    self.Alignment = str(FvAlignmentValue / 0x100000) + "M"\r
+                            else:\r
+                                self.Alignment = str (FvAlignmentValue / 0x400) + "K"\r
+                        else:\r
+                            # FvAlignmentValue is less than 1K\r
+                            self.Alignment = str (FvAlignmentValue)\r
+                        FvFileObj.close()\r
                 else:\r
                     EdkLogger.error("GenFds", GENFDS_ERROR, "FvImageSection Failed! %s NOT found in FDF" % self.FvName)\r
 \r
@@ -90,7 +139,7 @@ class FvImageSection(FvImageSectionClassObject):
             # Prepare the parameter of GenSection\r
             #\r
             OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + SecNum + Ffs.SectionSuffix.get("FV_IMAGE"))\r
-            GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')\r
+            GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE', IsMakefile=IsMakefile)\r
             OutputFileList.append(OutputFile)\r
 \r
             return OutputFileList, self.Alignment\r