BaseTools: Update Makefile to support FFS file generation

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

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 945c5489fdfede83b46ce4f5fadc15f91b7629f0..c946758cf549cf7914d8af9c6d9468fb8064e5e6 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process FD Region generation\r
 #\r
-#  Copyright (c) 2007 - 2015, 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
@@ -74,11 +74,14 @@ class Region(RegionClassObject):
     #   @retval string      Generated FV file path\r
     #\r
 \r
-    def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}):\r
+    def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}, Flag=False):\r
         Size = self.Size\r
-        GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
-        GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" % Size)\r
+        if not Flag:\r
+            GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
+            GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" % Size)\r
         GenFdsGlobalVariable.SharpCounter = 0\r
+        if Flag and (self.RegionType != 'FV'):\r
+            return\r
 \r
         if self.RegionType == 'FV':\r
             #\r
@@ -91,7 +94,8 @@ class Region(RegionClassObject):
                 FileName = None\r
                 if RegionData.endswith(".fv"):\r
                     RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
-                    GenFdsGlobalVariable.InfLogger('   Region FV File Name = .fv : %s' % RegionData)\r
+                    if not Flag:\r
+                        GenFdsGlobalVariable.InfLogger('   Region FV File Name = .fv : %s' % RegionData)\r
                     if RegionData[1] != ':' :\r
                         RegionData = mws.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
                     if not os.path.exists(RegionData):\r
@@ -99,7 +103,8 @@ class Region(RegionClassObject):
 \r
                     FileName = RegionData\r
                 elif RegionData.upper() + 'fv' in ImageBinDict.keys():\r
-                    GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
+                    if not Flag:\r
+                        GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
                     FileName = ImageBinDict[RegionData.upper() + 'fv']\r
                 else:\r
                     #\r
@@ -110,7 +115,8 @@ class Region(RegionClassObject):
                         FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(RegionData.upper())\r
 \r
                     if FvObj != None :\r
-                        GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
+                        if not Flag:\r
+                            GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
                         #\r
                         # Call GenFv tool\r
                         #\r
@@ -124,7 +130,10 @@ class Region(RegionClassObject):
                         FvBaseAddress = '0x%X' % self.FvAddress\r
                         BlockSize = None\r
                         BlockNum = None\r
-                        FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict)\r
+                        FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict, Flag=Flag)\r
+                        if Flag:\r
+                            continue\r
+\r
                         if FvBuffer.len > Size:\r
                             FvBuffer.close()\r
                             EdkLogger.error("GenFds", GENFDS_ERROR,\r
@@ -142,20 +151,22 @@ class Region(RegionClassObject):
                 #\r
                 # Add the exist Fv image into FD buffer\r
                 #\r
-                if FileName != None:\r
-                    FileLength = os.stat(FileName)[ST_SIZE]\r
-                    if FileLength > Size:\r
-                        EdkLogger.error("GenFds", GENFDS_ERROR,\r
-                                        "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
-                                        % (RegionData, Size))\r
-                    BinFile = open(FileName, 'rb')\r
-                    Buffer.write(BinFile.read())\r
-                    BinFile.close()\r
-                    Size = Size - FileLength\r
+                if not Flag:\r
+                    if FileName != None:\r
+                        FileLength = os.stat(FileName)[ST_SIZE]\r
+                        if FileLength > Size:\r
+                            EdkLogger.error("GenFds", GENFDS_ERROR,\r
+                                            "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
+                                            % (RegionData, Size))\r
+                        BinFile = open(FileName, 'rb')\r
+                        Buffer.write(BinFile.read())\r
+                        BinFile.close()\r
+                        Size = Size - FileLength\r
             #\r
             # Pad the left buffer\r
             #\r
-            self.PadBuffer(Buffer, ErasePolarity, Size)\r
+            if not Flag:\r
+                self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
         if self.RegionType == 'CAPSULE':\r
             #\r