from io import BytesIO\r
from struct import *\r
from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
-from . import Ffs\r
+from .Ffs import SectionSuffix,FdfFvFileTypeToFileType\r
import subprocess\r
import sys\r
from . import Section\r
self.InfModule = Inf\r
self.PcdIsDriver = Inf.PcdIsDriver\r
self.IsBinaryModule = Inf.IsBinaryModule\r
- Inf._GetDepex()\r
- Inf._GetDepexExpression()\r
- if len(Inf._Depex.data) > 0 and len(Inf._DepexExpression.data) > 0:\r
+ if len(Inf.Depex.data) > 0 and len(Inf.DepexExpression.data) > 0:\r
self.Depex = True\r
\r
GenFdsGlobalVariable.VerboseLogger("BaseName : %s" % self.BaseName)\r
\r
SecNum = '%d' %Index\r
GenSecOutputFile= self.__ExtendMacro__(Rule.NameGuid) + \\r
- Ffs.Ffs.SectionSuffix[SectionType] + SUP_MODULE_SEC + SecNum\r
+ SectionSuffix[SectionType] + SUP_MODULE_SEC + SecNum\r
Index = Index + 1\r
OutputFile = os.path.join(self.OutputPath, GenSecOutputFile)\r
File = GenFdsGlobalVariable.MacroExtend(File, Dict, self.CurrentArch)\r
else:\r
SecNum = '%d' %Index\r
GenSecOutputFile= self.__ExtendMacro__(Rule.NameGuid) + \\r
- Ffs.Ffs.SectionSuffix[SectionType] + SUP_MODULE_SEC + SecNum\r
+ SectionSuffix[SectionType] + SUP_MODULE_SEC + SecNum\r
OutputFile = os.path.join(self.OutputPath, GenSecOutputFile)\r
GenSecInputFile = GenFdsGlobalVariable.MacroExtend(GenSecInputFile, Dict, self.CurrentArch)\r
\r
self.ModuleGuid = RegistryGuidStr\r
\r
GenFdsGlobalVariable.GenerateFfs(FfsOutput, InputSection,\r
- Ffs.Ffs.FdfFvFileTypeToFileType[Rule.FvFileType],\r
+ FdfFvFileTypeToFileType[Rule.FvFileType],\r
self.ModuleGuid, Fixed=Rule.Fixed,\r
CheckSum=Rule.CheckSum, Align=Rule.Alignment,\r
SectionAlign=SectionAlignments,\r
# @retval string File name of the generated section file\r
#\r
def __GenComplexFileSection__(self, Rule, FvChildAddr, FvParentAddr, IsMakefile = False):\r
- if self.ModuleType in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM):\r
+ if self.ModuleType in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM, SUP_MODULE_MM_CORE_STANDALONE):\r
if Rule.KeepReloc is not None:\r
self.KeepRelocFromRule = Rule.KeepReloc\r
SectFiles = []\r
\r
FfsOutput = os.path.join( self.OutputPath, self.ModuleGuid + '.ffs')\r
GenFdsGlobalVariable.GenerateFfs(FfsOutput, InputFile,\r
- Ffs.Ffs.FdfFvFileTypeToFileType[Rule.FvFileType],\r
+ FdfFvFileTypeToFileType[Rule.FvFileType],\r
self.ModuleGuid, Fixed=Rule.Fixed,\r
CheckSum=Rule.CheckSum, Align=Rule.Alignment,\r
SectionAlign=Alignments,\r