Sync EDKII BaseTools to BaseTools project r1903.

[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 3a3e714228e4c75e5f7b0e628fbcc1cc656bce10..c945ce9b9bdaff70fbc8933e41ea8b126646f65d 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -73,7 +73,13 @@ class FvImageSection(FvImageSectionClassObject):
             Fv = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName)\r
             if Fv != None:\r
                 self.Fv = Fv\r
-                FvFileName = self.Fv.AddToBuffer(Buffer, MacroDict = Dict)\r
+                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict)\r
+                if Fv.FvAlignment != None:\r
+                    if self.Alignment == None:\r
+                        self.Alignment = Fv.FvAlignment\r
+                    else:\r
+                        if GenFdsGlobalVariable.GetAlignment (Fv.FvAlignment) > GenFdsGlobalVariable.GetAlignment (self.Alignment):\r
+                            self.Alignment = Fv.FvAlignment\r
             else:\r
                 if self.FvFileName != None:\r
                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)\r