BaseTools: Define and use a set for common list
share a set for both PEI module types 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:
committed by
Yonghong Zhu
parent
8bb63e377b
commit
88c6c1b64c
@@ -1430,7 +1430,7 @@ class PlatformAutoGen(AutoGen):
|
||||
# used by DXE module, it should be stored in DXE PCD database.
|
||||
# The default Phase is DXE
|
||||
#
|
||||
if M.ModuleType in [SUP_MODULE_PEIM, SUP_MODULE_PEI_CORE]:
|
||||
if M.ModuleType in SUP_MODULE_SET_PEI:
|
||||
PcdFromModule.Phase = "PEI"
|
||||
if PcdFromModule not in self._DynaPcdList_:
|
||||
self._DynaPcdList_.append(PcdFromModule)
|
||||
@@ -1472,7 +1472,7 @@ class PlatformAutoGen(AutoGen):
|
||||
# make sure that the "VOID*" kind of datum has MaxDatumSize set
|
||||
if PcdFromModule.DatumType == TAB_VOID and PcdFromModule.MaxDatumSize in [None, '']:
|
||||
NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, InfName))
|
||||
if M.ModuleType in [SUP_MODULE_PEIM, SUP_MODULE_PEI_CORE]:
|
||||
if M.ModuleType in SUP_MODULE_SET_PEI:
|
||||
PcdFromModule.Phase = "PEI"
|
||||
if PcdFromModule not in self._DynaPcdList_ and PcdFromModule.Type in GenC.gDynamicExPcd:
|
||||
self._DynaPcdList_.append(PcdFromModule)
|
||||
|
@@ -1409,7 +1409,7 @@ def CreateLibraryConstructorCode(Info, AutoGenC, AutoGenH):
|
||||
if Lib.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:
|
||||
ConstructorPrototypeString.Append(gLibraryStructorPrototype[SUP_MODULE_BASE].Replace(Dict))
|
||||
ConstructorCallingString.Append(gLibraryStructorCall[SUP_MODULE_BASE].Replace(Dict))
|
||||
elif Lib.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:
|
||||
elif Lib.ModuleType in SUP_MODULE_SET_PEI:
|
||||
ConstructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))
|
||||
ConstructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))
|
||||
elif Lib.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,
|
||||
@@ -1439,7 +1439,7 @@ def CreateLibraryConstructorCode(Info, AutoGenC, AutoGenH):
|
||||
else:
|
||||
if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:
|
||||
AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict))
|
||||
elif Info.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:
|
||||
elif Info.ModuleType in SUP_MODULE_SET_PEI:
|
||||
AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))
|
||||
elif Info.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,
|
||||
SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]:
|
||||
@@ -1471,7 +1471,7 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
|
||||
if Lib.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:
|
||||
DestructorPrototypeString.Append(gLibraryStructorPrototype[SUP_MODULE_BASE].Replace(Dict))
|
||||
DestructorCallingString.Append(gLibraryStructorCall[SUP_MODULE_BASE].Replace(Dict))
|
||||
elif Lib.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:
|
||||
elif Lib.ModuleType in SUP_MODULE_SET_PEI:
|
||||
DestructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))
|
||||
DestructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))
|
||||
elif Lib.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,
|
||||
@@ -1501,7 +1501,7 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
|
||||
else:
|
||||
if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:
|
||||
AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict))
|
||||
elif Info.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:
|
||||
elif Info.ModuleType in SUP_MODULE_SET_PEI:
|
||||
AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))
|
||||
elif Info.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,
|
||||
SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]:
|
||||
|
Reference in New Issue
Block a user