summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStar Zeng <star.zeng@intel.com>2015-07-29 05:59:50 +0000
committerlzeng14 <lzeng14@Edk2>2015-07-29 05:59:50 +0000
commit94dfaa233c3500bb01eb6da74259974a9d27891c (patch)
tree683f148e79ea110f7466a96e663add5fff25c538
parenteb63c77b8eb47601345683c9c9d2962832d1b81f (diff)
downloadedk2-94dfaa233c3500bb01eb6da74259974a9d27891c.zip
edk2-94dfaa233c3500bb01eb6da74259974a9d27891c.tar.gz
edk2-94dfaa233c3500bb01eb6da74259974a9d27891c.tar.bz2
Vlv2TbltDevicePkg: Exclude CapsuleX64 from IA32 build
CapsuleX64 is for 64bits capsule data access in PEI phase, it is only needed for X64 DXE build. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Tim He <tim.he@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18106 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--Vlv2TbltDevicePkg/PlatformPkg.fdf2
-rw-r--r--Vlv2TbltDevicePkg/PlatformPkgGcc.fdf2
-rw-r--r--Vlv2TbltDevicePkg/PlatformPkgIA32.dsc9
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 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
!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 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
!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 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
!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>