tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 13:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Gerd Hoffmann 2022-12-09 21:03:46 +08:00 committed by mergify[bot]
parent 127e2c5315
commit 5c25f6c67b
13 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OvmfPkg/AmdSev/AmdSevX64.dsc
View File

@ -33,7 +33,7 @@
# #
DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE
!include OvmfPkg/OvmfTpmDefines.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
# #
# Shell can be useful for debugging but should not be enabled for production # Shell can be useful for debugging but should not be enabled for production
@ -200,7 +200,7 @@
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
!include OvmfPkg/OvmfTpmLibs.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
[LibraryClasses.common] [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@ -527,12 +527,12 @@
# Set ConfidentialComputing defaults # Set ConfidentialComputing defaults
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
!include OvmfPkg/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000
[PcdsDynamicHii] [PcdsDynamicHii]
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
################################################################################ ################################################################################
# #
@ -573,7 +573,7 @@
UefiCpuPkg/CpuMpPei/CpuMpPei.inf UefiCpuPkg/CpuMpPei/CpuMpPei.inf
OvmfPkg/AmdSev/SecretPei/SecretPei.inf OvmfPkg/AmdSev/SecretPei/SecretPei.inf
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
# #
# DXE Phase modules # DXE Phase modules
@ -595,7 +595,7 @@
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {
<LibraryClasses> <LibraryClasses>
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
} }
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@ -766,4 +766,4 @@
# #
# TPM support # TPM support
# #
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc

14
OvmfPkg/CloudHv/CloudHvX64.dsc
View File

@ -33,7 +33,7 @@
DEFINE SMM_REQUIRE = FALSE DEFINE SMM_REQUIRE = FALSE
DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE
!include OvmfPkg/OvmfTpmDefines.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
# #
# Network definition # Network definition
@ -247,7 +247,7 @@
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
!include OvmfPkg/OvmfTpmLibs.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
[LibraryClasses.common] [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@ -630,7 +630,7 @@
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
!include OvmfPkg/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support. # IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@ -640,7 +640,7 @@
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
[PcdsDynamicHii] [PcdsDynamicHii]
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
################################################################################ ################################################################################
# #
@ -690,7 +690,7 @@
!endif !endif
UefiCpuPkg/CpuMpPei/CpuMpPei.inf UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
# #
# DXE Phase modules # DXE Phase modules
@ -714,7 +714,7 @@
<LibraryClasses> <LibraryClasses>
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
!endif !endif
} }
@ -945,4 +945,4 @@
# #
# TPM support # TPM support
# #
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc

0
OvmfPkg/OvmfTpmComponentsDxe.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
View File

0
OvmfPkg/OvmfTpmComponentsPei.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
View File

0
OvmfPkg/OvmfTpmDefines.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
View File

0
OvmfPkg/OvmfTpmLibs.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
View File

0
OvmfPkg/OvmfTpmPcds.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
View File

0
OvmfPkg/OvmfTpmPcdsHii.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
View File

0
OvmfPkg/OvmfTpmSecurityStub.dsc.inc → OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
View File

2
OvmfPkg/Microvm/MicrovmX64.dsc
View File

@ -703,7 +703,7 @@
<LibraryClasses> <LibraryClasses>
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
!endif !endif
} }

14
OvmfPkg/OvmfPkgIa32.dsc
View File

@ -34,7 +34,7 @@
DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE
DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE
!include OvmfPkg/OvmfTpmDefines.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
# #
# Shell can be useful for debugging but should not be enabled for production # Shell can be useful for debugging but should not be enabled for production
@ -252,7 +252,7 @@
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
!include OvmfPkg/OvmfTpmLibs.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
[LibraryClasses.common] [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@ -657,7 +657,7 @@
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
!include OvmfPkg/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support. # IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@ -671,7 +671,7 @@
!endif !endif
[PcdsDynamicHii] [PcdsDynamicHii]
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
################################################################################ ################################################################################
# #
@ -721,7 +721,7 @@
!endif !endif
UefiCpuPkg/CpuMpPei/CpuMpPei.inf UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
# #
# DXE Phase modules # DXE Phase modules
@ -746,7 +746,7 @@
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!endif !endif
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
} }
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@ -1014,7 +1014,7 @@
# #
# TPM support # TPM support
# #
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf

14
OvmfPkg/OvmfPkgIa32X64.dsc
View File

@ -33,7 +33,7 @@
DEFINE SMM_REQUIRE = FALSE DEFINE SMM_REQUIRE = FALSE
DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE
!include OvmfPkg/OvmfTpmDefines.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
# #
# Shell can be useful for debugging but should not be enabled for production # Shell can be useful for debugging but should not be enabled for production
@ -256,7 +256,7 @@
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
!include OvmfPkg/OvmfTpmLibs.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
[LibraryClasses.common] [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@ -669,7 +669,7 @@
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
!include OvmfPkg/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
# Set ConfidentialComputing defaults # Set ConfidentialComputing defaults
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
@ -684,7 +684,7 @@
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
[PcdsDynamicHii] [PcdsDynamicHii]
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
################################################################################ ################################################################################
# #
@ -734,7 +734,7 @@
!endif !endif
UefiCpuPkg/CpuMpPei/CpuMpPei.inf UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
[Components.X64] [Components.X64]
# #
@ -760,7 +760,7 @@
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!endif !endif
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
} }
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@ -1032,4 +1032,4 @@
# #
# TPM support # TPM support
# #
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc

14
OvmfPkg/OvmfPkgX64.dsc
View File

@ -33,7 +33,7 @@
DEFINE SMM_REQUIRE = FALSE DEFINE SMM_REQUIRE = FALSE
DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE
!include OvmfPkg/OvmfTpmDefines.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
# #
# Shell can be useful for debugging but should not be enabled for production # Shell can be useful for debugging but should not be enabled for production
@ -272,7 +272,7 @@
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
!include OvmfPkg/OvmfTpmLibs.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
[LibraryClasses.common] [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@ -693,7 +693,7 @@
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
!include OvmfPkg/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support. # IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@ -707,7 +707,7 @@
!endif !endif
[PcdsDynamicHii] [PcdsDynamicHii]
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
################################################################################ ################################################################################
# #
@ -780,7 +780,7 @@
NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf
} }
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
# #
# DXE Phase modules # DXE Phase modules
@ -804,7 +804,7 @@
<LibraryClasses> <LibraryClasses>
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
!endif !endif
} }
@ -1102,4 +1102,4 @@
# #
# TPM support # TPM support
# #
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc