Reviewed-by: Tim He <tim...@intel.com>
-----Original Message-----
From: Zeng, Star
Sent: Tuesday, July 28, 2015 6:08 PM
To: edk2-devel@lists.01.org
Cc: Wei, David; He, Tim
Subject: [PATCH] Vlv2TbltDevicePkg: Exclude CapsuleX64 from IA32 build
CapsuleX64 is for 64bits capsule data access in PEI phase, it is only needed
for X64 DXE build.
Cc: David Wei <david....@intel.com>
Cc: Tim He <tim...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.z...@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 2 ++
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 2 ++
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 9 ---------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf
b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 80ce20d..03cabb9 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -359,8 +359,10 @@ [FV.FVRECOVERY]
!if $(CAPSULE_ENABLE) == TRUE
INF MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
+!if $(DXE_ARCHITECTURE) == "X64"
INF MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
!endif
+!endif
!if $(MINNOW2_FSP_BUILD) == FALSE
!if $(PCIESC_ENABLE) == TRUE
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index f556853..9ec4ce5 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -317,8 +317,10 @@ [FV.FVRECOVERY]
!if $(CAPSULE_ENABLE) == TRUE
INF MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
+!if $(DXE_ARCHITECTURE) == "X64"
INF MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
!endif
+!endif
!if $(MINNOW2_FSP_BUILD) == FALSE
!if $(PCIESC_ENABLE) == TRUE
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 39054cf..2fa7a36 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1100,15 +1100,6 @@ [Components.IA32] !endif
}
-!if $(CAPSULE_ENABLE) == TRUE
- MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {
- <LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
- HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
- }
-!endif
-
MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
<LibraryClasses>
--
1.9.5.msysgit.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
