BaseTools: Extend the RAW format to support multiple binary files

Current FDF spec updated to support multiple binary files for RAW File
in the [FV] and [Capsule] section. For the multiple normal files, it may
have the optional FfsAlignment.
Example:
FILE RAW = 197DB236-F856-4924-91F8-C1F12FB875F3 {
 Align=16 $(PLATFORM_PACKAGE)/Binaries/File1.pdb
 Align=16 $(PLATFORM_PACKAGE)/Binaries/File2.pdb
 Align=16 $(PLATFORM_PACKAGE)/Binaries/File3.pdb
}

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

1 files changed, 29 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index df97ccbab6..e385ccb1b5 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -1,7 +1,7 @@
 ## @file

 # process FV 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

@@ -112,6 +112,34 @@ class FV (FvClassObject):
 

         # Process Modules in FfsList

         for FfsFile in self.FfsList :

+            if hasattr(FfsFile, 'FvFileType') and FfsFile.FvFileType == 'RAW':

+                if isinstance(FfsFile.FileName, list) and isinstance(FfsFile.Alignment, list) and len(FfsFile.FileName) == len(FfsFile.Alignment):

+                    FileContent = ''

+                    for Index, File in enumerate(FfsFile.FileName):

+                        try:

+                            f = open(File, 'r+b')

+                        except:

+                            GenFdsGlobalVariable.ErrorLogger("Error opening RAW file %s." % (File))

+                        Content = f.read()

+                        f.close()

+                        AlignValue = FfsFile.Alignment[Index]

+                        if AlignValue == None:

+                            AlignValue = 1

+                        FileContent += Content

+                        if len(FileContent) % AlignValue != 0:

+                            Size = AlignValue - len(FileContent) % AlignValue

+                            for i in range(0, Size):

+                                FileContent += pack('B', 0xFF)

+

+                    if FileContent:

+                        OutputRAWFile = os.path.join(GenFdsGlobalVariable.FfsDir, FfsFile.NameGuid, FfsFile.NameGuid + '.raw')

+                        SaveFileOnChange(OutputRAWFile, FileContent, True)

+                        FfsFile.FileName = OutputRAWFile

+                        if max(FfsFile.Alignment):

+                            FfsFile.Alignment = str(max(FfsFile.Alignment))

+                        else:

+                            FfsFile.Alignment = None

+

             FileName = FfsFile.GenFfs(MacroDict, FvParentAddr=BaseAddress)

             FfsFileList.append(FileName)

             self.FvInfFile.writelines("EFI_FILE_NAME = " + \