From: Yonghong Zhu <yonghong.zhu@intel.com>
Date: Wed, 23 Mar 2016 09:55:50 +0000 (+0800)
Subject: BaseTools: generate alignment when the FV content come from the filesystem
X-Git-Tag: edk2-stable201903~7493
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=877c0a93be4317f5715347359cc78d41f4654748

BaseTools: generate alignment when the FV content come from the filesystem

when the FV contents come from the filesystem instead of from a named FDF
section, the build tool missed to generate alignment for this FV. The fix
is get the alignment value from FV header and use this value to generate
alignment.

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

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index caf8de11e5..b577de263c 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 - 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2016, 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
@@ -83,6 +83,24 @@ class FvImageSection(FvImageSectionClassObject):
             else:
                 if self.FvFileName != None:
                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)
+                    if os.path.isfile(FvFileName):
+                        FvFileObj = open (FvFileName,'r+b')
+                        FvFileObj.seek(0)
+                        # PI FvHeader is 0x48 byte
+                        FvHeaderBuffer = FvFileObj.read(0x48)
+                        # FV alignment position.
+                        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"
+                            else:
+                                self.Alignment = str (FvAlignmentValue / 0x400) + "K"
+                        else:
+                            # FvAlignmentValue is less than 1K
+                            self.Alignment = str (FvAlignmentValue)
+                        FvFileObj.close()
                 else:
                     EdkLogger.error("GenFds", GENFDS_ERROR, "FvImageSection Failed! %s NOT found in FDF" % self.FvName)