[edk2-devel] [PATCH] Platform/Vlv2TbltDevicePkg: Remove dependency of DxeDeferImageLoadLib

Zhang, Shenglei posted 1 patch 4 years, 9 months ago
Failed in applying to current master (apply log)
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 +---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 4 +---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc    | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
[edk2-devel] [PATCH] Platform/Vlv2TbltDevicePkg: Remove dependency of DxeDeferImageLoadLib
Posted by Zhang, Shenglei 4 years, 9 months ago
The library DxeDeferImageLoadLib supports UID feature and
it is conflicted with the driver SecurityStubDxe. And the UID
feature is dropped. So DxeDeferImageLoadLib should be removed.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 +---
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 4 +---
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc    | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 9df74c6620..0a57587e82 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1096,9 +1096,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(SECURE_BOOT_ENABLE) == TRUE
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
 !endif
-!if $(USER_IDENTIFICATION_ENABLE)
-      NULL|SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
-!endif
+
 !if $(TPM_ENABLED) == TRUE
       NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
 !endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index f07b6293fd..933a7ec760 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1081,9 +1081,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(SECURE_BOOT_ENABLE) == TRUE
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
 !endif
-!if $(USER_IDENTIFICATION_ENABLE)
-      NULL|SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
-!endif
+
 !if $(TPM_ENABLED) == TRUE
       NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
 !endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index cddd580a96..9ec48f9fee 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1097,9 +1097,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(SECURE_BOOT_ENABLE) == TRUE
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
 !endif
-!if $(USER_IDENTIFICATION_ENABLE)
-      NULL|SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
-!endif
+
 !if $(TPM_ENABLED) == TRUE
       NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
 !endif
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42789): https://edk2.groups.io/g/devel/message/42789
Mute This Topic: https://groups.io/mt/32201140/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] Platform/Vlv2TbltDevicePkg: Remove dependency of DxeDeferImageLoadLib
Posted by Sun, Zailiang 4 years, 9 months ago
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42919): https://edk2.groups.io/g/devel/message/42919
Mute This Topic: https://groups.io/mt/32201140/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-