BaseTools: extend FFS alignment to 16M

Current FFS only supports 64KiB alignment for data, Per PI 1.6
requirement, we extend FFS alignment to 16M.

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

8 files changed, 68 insertions, 35 deletions

diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index 8e68a67e44..7d129bfcab 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -1,7 +1,7 @@
 ## @file

 # parse FDF file

 #

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -2340,7 +2340,8 @@ class FdfParser(object):
         

         AlignValue = None

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

             

@@ -2608,7 +2609,8 @@ class FdfParser(object):
         

         AlignValue = None

         if self.__GetAlignment():

-            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

             

@@ -2924,7 +2926,8 @@ class FdfParser(object):
             

         AlignValue = ""

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

 

@@ -2988,7 +2991,8 @@ class FdfParser(object):
                 CheckSum = True

     

             if self.__GetAlignment():

-                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                        "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                     raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

                 if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):

                     raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

@@ -3062,7 +3066,8 @@ class FdfParser(object):
                 FvImageSectionObj.FvFileType = self.__Token

                 

                 if self.__GetAlignment():

-                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                            "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                         raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

                     FvImageSectionObj.Alignment = self.__Token

                 

@@ -3129,7 +3134,8 @@ class FdfParser(object):
                 EfiSectionObj.BuildNum = self.__Token

                 

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):

                 raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

diff --git a/BaseTools/Source/Python/GenFds/DataSection.py b/BaseTools/Source/Python/GenFds/DataSection.py
index ba3677ed89..78c0af4db1 100644
--- a/BaseTools/Source/Python/GenFds/DataSection.py
+++ b/BaseTools/Source/Python/GenFds/DataSection.py
@@ -1,7 +1,7 @@
 ## @file

 # process data section generation

 #

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -79,8 +79,10 @@ class DataSection (DataSectionClassObject):
             ImageObj = PeImageClass (Filename)

             if ImageObj.SectionAlignment < 0x400:

                 self.Alignment = str (ImageObj.SectionAlignment)

-            else:

+            elif ImageObj.SectionAlignment < 0x100000:

                 self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'

+            else:

+                self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'

 

         NoStrip = True

         if self.SecType in ('TE', 'PE32'):

diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py
index 09fb28f32d..7da3c1e7b0 100644
--- a/BaseTools/Source/Python/GenFds/EfiSection.py
+++ b/BaseTools/Source/Python/GenFds/EfiSection.py
@@ -1,7 +1,7 @@
 ## @file

 # process rule section generation

 #

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -231,8 +231,10 @@ class EfiSection (EfiSectionClassObject):
                         ImageObj = PeImageClass (File)

                         if ImageObj.SectionAlignment < 0x400:

                             Align = str (ImageObj.SectionAlignment)

-                        else:

+                        elif ImageObj.SectionAlignment < 0x100000:

                             Align = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                        else:

+                            Align = str (ImageObj.SectionAlignment / 0x100000) + 'M'

 

                     if File[(len(File)-4):] == '.efi':

                         MapFile = File.replace('.efi', '.map')

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 8f49f9faad..499d0a6f05 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2767,7 +2767,8 @@ class FdfParser:
         while True:

             AlignValue = None

             if self.__GetAlignment():

-                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                        "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                     raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

                 #For FFS, Auto is default option same to ""

                 if not self.__Token == "Auto":

@@ -2826,7 +2827,8 @@ class FdfParser:
             FfsFileObj.CheckSum = True

 

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             #For FFS, Auto is default option same to ""

             if not self.__Token == "Auto":

@@ -2897,7 +2899,8 @@ class FdfParser:
 

         AlignValue = None

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

 

@@ -3186,7 +3189,8 @@ class FdfParser:
 

         AlignValue = None

         if self.__GetAlignment():

-            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

 

@@ -3777,7 +3781,8 @@ class FdfParser:
 

         AlignValue = ""

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             #For FFS, Auto is default option same to ""

             if not self.__Token == "Auto":

@@ -3826,7 +3831,8 @@ class FdfParser:
 

             SectAlignment = ""

             if self.__GetAlignment():

-                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                        "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                     raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

                 if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):

                     raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

@@ -3905,7 +3911,8 @@ class FdfParser:
                 FvImageSectionObj.FvFileType = self.__Token

 

                 if self.__GetAlignment():

-                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                            "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                         raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

                     FvImageSectionObj.Alignment = self.__Token

 

@@ -3972,7 +3979,8 @@ class FdfParser:
                 EfiSectionObj.BuildNum = self.__Token

 

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                                    "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):

                 raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index c61c227c99..958cecfad6 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -1,7 +1,7 @@
 ## @file

 # process FFS generation from INF statement

 #

-#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 #  Copyright (c) 2014-2016 Hewlett-Packard Development Company, L.P.<BR>

 #

 #  This program and the accompanying materials

@@ -731,8 +731,10 @@ class FfsInfStatement(FfsInfStatementClassObject):
                     ImageObj = PeImageClass (File)

                     if ImageObj.SectionAlignment < 0x400:

                         self.Alignment = str (ImageObj.SectionAlignment)

-                    else:

+                    elif ImageObj.SectionAlignment < 0x100000:

                         self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                    else:

+                        self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'

 

                 if not NoStrip:

                     FileBeforeStrip = os.path.join(self.OutputPath, ModuleName + '.reloc')

@@ -770,8 +772,10 @@ class FfsInfStatement(FfsInfStatementClassObject):
                 ImageObj = PeImageClass (GenSecInputFile)

                 if ImageObj.SectionAlignment < 0x400:

                     self.Alignment = str (ImageObj.SectionAlignment)

-                else:

+                elif ImageObj.SectionAlignment < 0x100000:

                     self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                else:

+                    self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'

 

             if not NoStrip:

                 FileBeforeStrip = os.path.join(self.OutputPath, ModuleName + '.reloc')

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index f6ccb59d77..4b03adc1c8 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -196,9 +196,12 @@ class FV (FvClassObject):
             FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)

             # FvAlignmentValue is larger than or equal to 1K

             if FvAlignmentValue >= 0x400:

-                if FvAlignmentValue >= 0x10000:

-                    #The max alignment supported by FFS is 64K.

-                    self.FvAlignment = "64K"

+                if FvAlignmentValue >= 0x100000:

+                    #The max alignment supported by FFS is 16M.

+                    if FvAlignmentValue >= 0x1000000:

+                        self.FvAlignment = "16M"

+                    else:

+                        self.FvAlignment = str(FvAlignmentValue / 0x100000) + "M"

                 else:

                     self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"

             else:

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index 5989978a7c..68f17c31e8 100644
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -1,7 +1,7 @@
 ## @file

 # process FV image section generation

 #

-#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -80,9 +80,12 @@ class FvImageSection(FvImageSectionClassObject):
 

             # MaxFvAlignment is larger than or equal to 1K

             if MaxFvAlignment >= 0x400:

-                if MaxFvAlignment >= 0x10000:

-                    #The max alignment supported by FFS is 64K.

-                    self.Alignment = "64K"

+                if MaxFvAlignment >= 0x100000:

+                    #The max alignment supported by FFS is 16M.

+                    if MaxFvAlignment >=1000000:

+                        self.Alignment = "16M"

+                    else:

+                        self.Alignment = str(MaxFvAlignment / 0x100000) + "M"

                 else:

                     self.Alignment = str (MaxFvAlignment / 0x400) + "K"

             else:

@@ -117,9 +120,12 @@ class FvImageSection(FvImageSectionClassObject):
                         FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)

                         # FvAlignmentValue is larger than or equal to 1K

                         if FvAlignmentValue >= 0x400:

-                            if FvAlignmentValue >= 0x10000:

-                                #The max alignment supported by FFS is 64K.

-                                self.Alignment = "64K"

+                            if FvAlignmentValue >= 0x100000:

+                                #The max alignment supported by FFS is 16M.

+                                if FvAlignmentValue >= 0x1000000:

+                                    self.Alignment = "16M"

+                                else:

+                                    self.Alignment = str(FvAlignmentValue / 0x100000) + "M"

                             else:

                                 self.Alignment = str (FvAlignmentValue / 0x400) + "K"

                         else:

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index d02befec11..83996beeea 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -1,7 +1,7 @@
 ## @file

 # Global variables for GenFds

 #

-#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -420,8 +420,10 @@ class GenFdsGlobalVariable:
     def GetAlignment (AlignString):

         if AlignString == None:

             return 0

-        if AlignString in ("1K", "2K", "4K", "8K", "16K", "32K", "64K"):

+        if AlignString in ("1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K", "512K"):

             return int (AlignString.rstrip('K')) * 1024

+        elif AlignString in ("1M", "2M", "4M", "8M", "16M"):

+            return int (AlignString.rstrip('M')) * 1024 * 1024

         else:

             return int (AlignString)

 

@@ -429,7 +431,7 @@ class GenFdsGlobalVariable:
     def GenerateFfs(Output, Input, Type, Guid, Fixed=False, CheckSum=False, Align=None,

                     SectionAlign=None):

         Cmd = ["GenFfs", "-t", Type, "-g", Guid]

-        mFfsValidAlign = ["0", "8", "16", "128", "512", "1K", "4K", "32K", "64K"]

+        mFfsValidAlign = ["0", "8", "16", "128", "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M", "16M"]

         if Fixed == True:

             Cmd += ["-x"]

         if CheckSum: