Sync EDKII BaseTools to BaseTools project r1903.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10123 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 7 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index 3a3e714228..c945ce9b9b 100644
--- 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)

             if Fv != None:

                 self.Fv = Fv

-                FvFileName = self.Fv.AddToBuffer(Buffer, MacroDict = Dict)

+                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict)

+                if Fv.FvAlignment != None:

+                    if self.Alignment == None:

+                        self.Alignment = Fv.FvAlignment

+                    else:

+                        if GenFdsGlobalVariable.GetAlignment (Fv.FvAlignment) > GenFdsGlobalVariable.GetAlignment (self.Alignment):

+                            self.Alignment = Fv.FvAlignment

             else:

                 if self.FvFileName != None:

                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)