From 3a4698202cf5ca81d4401bdc6c0974400064f333 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Mon, 25 Feb 2019 08:15:25 +0800 Subject: Revert "BaseTools:BaseTools supports to the driver combination." This reverts commit 838bc257bae3f9fc6723f41f3980f6cfbedb77e5. 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 Reviewed-by: Bob Feng --- BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'BaseTools/Source/Python/Workspace/WorkspaceCommon.py') diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py index 22abda8743..b79280bc2e 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -20,8 +20,6 @@ from Workspace.BuildClassObject import StructurePcd from Common.BuildToolError import RESOURCE_NOT_AVAILABLE from Common.BuildToolError import OPTION_MISSING from Common.BuildToolError import BUILD_ERROR -from Common.BuildToolError import PREBUILD_ERROR -import Common.EdkLogger as EdkLogError class OrderedListDict(OrderedDict): def __init__(self, *args, **kwargs): @@ -140,12 +138,6 @@ def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolcha return [] LibraryModule = BuildDatabase[LibraryPath, Arch, Target, Toolchain] - if LibraryModule.ModuleEntryPointList and LibraryModule.ModuleType != Module.ModuleType: - EdkLogError.error( - "build", PREBUILD_ERROR, - "Driver's ModuleType must be consistent [%s]" % (str(Module)), - File=str(FileName), - ExtraData="consumed by [%s]" % str(LibraryModule)) # for those forced library instance (NULL library), add a fake library class if LibraryClassName.startswith("NULL"): LibraryModule.LibraryClass.append(LibraryClassObject(LibraryClassName, [ModuleType])) -- cgit v1.2.3