sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "BaseTools:BaseTools supports to the driver combination."

Browse Source 
This reverts commit 838bc257ba.
After further evaluation, there are the unclear behavior in for the
driver combination feature. To not impact Q1 stable tag, remove it first.
1. If the drivers to be combined have the different PCD or library instance
   setting, build should not combine them and report build break. But this
   commit doesn't consider this case.
2. When start the sub driver fail, continue to start other sub driver. This
   behavior is required to be clarifed in build spec.
3. Unload the sub driver when the combined driver start fail. This case need
   to call the sub driver unload function for the driver start fail only.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Liming Gao
2019-02-25 08:15:25 +08:00
parent 90b24889f9
commit 3a4698202c
2 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
BaseTools/Source/Python/AutoGen/GenC.py
View File

@ -1457,25 +1457,10 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
if Info.IsLibrary or Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_SEC]:
return
ModuleEntryPointList = []
for Lib in Info.DependentLibraryList:
if len(Lib.ModuleEntryPointList) > 0:
if Lib.ModuleType == Info.ModuleType:
ModuleEntryPointList = ModuleEntryPointList + Lib.ModuleEntryPointList
else:
EdkLogger.error(
"build",
PREBUILD_ERROR,
"Driver's ModuleType must be consistent [%s]"%(str(Lib)),
File=str(Info.PlatformInfo),
ExtraData="consumed by [%s]" % str(Info.MetaFile)
)
ModuleEntryPointList = ModuleEntryPointList + Info.Module.ModuleEntryPointList
#
# Module Entry Points
#
NumEntryPoints = len(ModuleEntryPointList)
NumEntryPoints = len(Info.Module.ModuleEntryPointList)
if 'PI_SPECIFICATION_VERSION' in Info.Module.Specification:
PiSpecVersion = Info.Module.Specification['PI_SPECIFICATION_VERSION']
else:
@ -1485,7 +1470,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
else:
UefiSpecVersion = '0x00000000'
Dict = {
'Function' : ModuleEntryPointList,
'Function' : Info.Module.ModuleEntryPointList,
'PiSpecVersion' : PiSpecVersion + 'U',
'UefiSpecVersion': UefiSpecVersion + 'U'
}
@ -1498,7 +1483,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
AUTOGEN_ERROR,
'%s must have exactly one entry point' % Info.ModuleType,
File=str(Info),
ExtraData= ", ".join(ModuleEntryPointList)
ExtraData= ", ".join(Info.Module.ModuleEntryPointList)
)
if Info.ModuleType == SUP_MODULE_PEI_CORE:
AutoGenC.Append(gPeiCoreEntryPointString.Replace(Dict))
@ -1552,18 +1537,11 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
def CreateModuleUnloadImageCode(Info, AutoGenC, AutoGenH):
if Info.IsLibrary or Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE, SUP_MODULE_SEC]:
return
ModuleUnloadImageList = []
for Lib in Info.DependentLibraryList:
if len(Lib.ModuleUnloadImageList) > 0:
ModuleUnloadImageList = ModuleUnloadImageList + Lib.ModuleUnloadImageList
ModuleUnloadImageList = ModuleUnloadImageList + Info.Module.ModuleUnloadImageList
#
# Unload Image Handlers
#
NumUnloadImage = len(ModuleUnloadImageList)
Dict = {'Count':str(NumUnloadImage) + 'U', 'Function':ModuleUnloadImageList}
NumUnloadImage = len(Info.Module.ModuleUnloadImageList)
Dict = {'Count':str(NumUnloadImage) + 'U', 'Function':Info.Module.ModuleUnloadImageList}
if NumUnloadImage < 2:
AutoGenC.Append(gUefiUnloadImageString[NumUnloadImage].Replace(Dict))
else: