BaseTools: Eot - Remove FvImage file

move the single used class from FvImage to Eot
delete the FvImage file
remove FvImage from makefile

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben 2018-04-17 01:48:22 +08:00 committed by Yonghong Zhu
parent 5f446994a2
commit d498274fcd
3 changed files with 24 additions and 1437 deletions

View File

@ -1,7 +1,7 @@
## @file ## @file
# This file is used to be the main entrance of EOT tool # This file is used to be the main entrance of EOT tool
# #
# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -24,13 +24,35 @@ from Common.Misc import GuidStructureStringToGuidString
from InfParserLite import * from InfParserLite import *
import c import c
import Database import Database
from FvImage import *
from array import array from array import array
from Report import Report from Report import Report
from Common.BuildVersion import gBUILD_VERSION from Common.BuildVersion import gBUILD_VERSION
from Parser import ConvertGuid from Parser import ConvertGuid
from Common.LongFilePathSupport import OpenLongFilePath as open from Common.LongFilePathSupport import OpenLongFilePath as open
## MultipleFv() class
#
# A class for Multiple FV
#
class MultipleFv(FirmwareVolume):
def __init__(self, FvList):
FirmwareVolume.__init__(self)
self.BasicInfo = []
for FvPath in FvList:
FvName = os.path.splitext(os.path.split(FvPath)[1])[0]
Fd = open(FvPath, 'rb')
Buf = array('B')
try:
Buf.fromfile(Fd, os.path.getsize(FvPath))
except EOFError:
pass
Fv = FirmwareVolume(FvName)
Fv.frombuffer(Buf, 0, len(Buf))
self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size])
self.FfsDict.append(Fv.FfsDict)
## Class Eot ## Class Eot
# #
# This class is used to define Eot main entrance # This class is used to define Eot main entrance

File diff suppressed because it is too large Load Diff

View File

@ -110,7 +110,6 @@ CMD_BUILD=$(BASE_TOOLS_PATH)\Source\Python\build\BuildReport.py \
$(BASE_TOOLS_PATH)\Source\Python\Eot\EotGlobalData.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\EotGlobalData.py \
$(BASE_TOOLS_PATH)\Source\Python\Eot\EotToolError.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\EotToolError.py \
$(BASE_TOOLS_PATH)\Source\Python\Eot\FileProfile.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\FileProfile.py \
$(BASE_TOOLS_PATH)\Source\Python\Eot\FvImage.py \
$(BASE_TOOLS_PATH)\Source\Python\Eot\InfParserLite.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\InfParserLite.py \
$(BASE_TOOLS_PATH)\Source\Python\Eot\LzmaCompressor.pyd \ $(BASE_TOOLS_PATH)\Source\Python\Eot\LzmaCompressor.pyd \
$(BASE_TOOLS_PATH)\Source\Python\Eot\Parser.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\Parser.py \