1 files changed, 9 insertions, 0 deletions
diff --git a/BaseTools/Source/Python/GenFds/DataSection.py b/BaseTools/Source/Python/GenFds/DataSection.py
index dff469146..0f41953ad 100644
--- a/BaseTools/Source/Python/GenFds/DataSection.py
+++ b/BaseTools/Source/Python/GenFds/DataSection.py
@@ -21,6 +21,7 @@ import subprocess
 from Ffs import Ffs
 import os
 from CommonDataClass.FdfClass import DataSectionClassObject
+from Common.Misc import PeImageClass
 import shutil
 
 ## generate data section
@@ -74,6 +75,14 @@ class DataSection (DataSectionClassObject):
                     (os.path.getmtime(MapFile) > os.path.getmtime(CopyMapFile)):
                     shutil.copyfile(MapFile, CopyMapFile)
 
+        #Get PE Section alignment when align is set to AUTO
+        if self.Alignment == 'Auto' and self.SecType in ('TE', 'PE32'):
+            ImageObj = PeImageClass (Filename)
+            if ImageObj.SectionAlignment < 0x400:
+                self.Alignment = str (ImageObj.SectionAlignment)
+            else:
+                self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'
+
         NoStrip = True
         if self.SecType in ('TE', 'PE32'):
             if self.KeepReloc != None: