devel@edk2.groups.io | [PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory

Home Messages Hashtags Subgroups Calendar

Date Date 1 - 1 of 1

[PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory

Gerd Hoffmann #96897 Signed-off-by: Gerd Hoffmann <kraxel@...> --- OvmfPkg/AmdSev/AmdSevX64.fdf \| 6 +++--- OvmfPkg/Bhyve/BhyveX64.fdf \| 6 +++--- OvmfPkg/CloudHv/CloudHvX64.fdf \| 2 +- OvmfPkg/IntelTdx/IntelTdxX64.fdf \| 8 ++++---- OvmfPkg/Microvm/MicrovmX64.fdf \| 6 +++--- OvmfPkg/OvmfPkgIa32.fdf \| 8 ++++---- OvmfPkg/OvmfPkgIa32X64.fdf \| 8 ++++---- OvmfPkg/OvmfPkgX64.fdf \| 8 ++++---- OvmfPkg/OvmfXen.fdf \| 8 ++++---- OvmfPkg/Include/WorkArea.h \| 2 +- OvmfPkg/Sec/AmdSev.h \| 2 +- OvmfPkg/Sec/AmdSev.c \| 2 +- OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc \| 0 OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc \| 0 OvmfPkg/{ => inc}/VarStore.fdf.inc \| 0 OvmfPkg/{ => inc}/XenElfHeader.fdf.inc \| 0 16 files changed, 33 insertions(+), 33 deletions(-) rename OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ => inc}/VarStore.fdf.inc (100%) rename OvmfPkg/{ => inc}/XenElfHeader.fdf.inc (100%) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index bd23888e819f..dc110bd5bc7b 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -351,7 +351,7 @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index e8227f865f75..d22064967084 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -24,7 +24,7 @@ [FD.BHYVE] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.BHYVE_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.BHYVE_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -368,7 +368,7 @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index 23296f4bfeae..a45cfa050403 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -378,7 +378,7 @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf index 6923eb883113..f594e88d62e7 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -332,7 +332,7 @@ [FV.FVMAIN_COMPACT] } } -# !include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +# !include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 380ba3a36883..a9a0944bb91d 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -24,7 +24,7 @@ [FD.MICROVM] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -335,7 +335,7 @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 0b0c18674727..f4046321a8b5 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -410,7 +410,7 @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 4ed3a4f9d72b..e2a2c89f19b7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -413,7 +413,7 @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index d0744c463da4..70f8e8b782da 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)\|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -440,7 +440,7 @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 029b7dadcb25..63df9b54d4ad 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -12,7 +12,7 @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # This will allow the flash device image to be recognize as an ELF, with first @@ -32,7 +32,7 @@ [FD.OVMF] 0x00000000\|0x00040000 !endif -!include XenElfHeader.fdf.inc +!include OvmfPkg/inc/XenElfHeader.fdf.inc !if ($(FD_SIZE_IN_KB) == 1024) \|\| ($(FD_SIZE_IN_KB) == 2048) 0x0000e000\|0x00001000 @@ -86,7 +86,7 @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -388,7 +388,7 @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Include/WorkArea.h b/OvmfPkg/Include/WorkArea.h index bf56fc4a6f65..65a37df0f70a 100644 --- a/OvmfPkg/Include/WorkArea.h +++ b/OvmfPkg/Include/WorkArea.h @@ -21,7 +21,7 @@ // sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER) // PcdOvmfConfidentialComputingWorkAreaHeader defined in: // OvmfPkg/OvmfPkg.dec -// OvmfPkg/OvmfPkgDefines.fdf.inc +// OvmfPkg/inc/OvmfPkgDefines.fdf.inc typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER { UINT8 GuestType; UINT8 Reserved1[3]; diff --git a/OvmfPkg/Sec/AmdSev.h b/OvmfPkg/Sec/AmdSev.h index dffd2ceb9656..66ac6e67e3ba 100644 --- a/OvmfPkg/Sec/AmdSev.h +++ b/OvmfPkg/Sec/AmdSev.h @@ -71,7 +71,7 @@ SevEsIsEnabled ( / Validate System RAM used for decompressing the PEI and DXE firmware volumes when SEV-SNP is active. The PCDs SecValidatedStart and SecValidatedEnd are - set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + set in OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc. / VOID diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c index 6af38aaf46ee..51c322b0ad22 100644 --- a/OvmfPkg/Sec/AmdSev.c +++ b/OvmfPkg/Sec/AmdSev.c @@ -284,7 +284,7 @@ SevEsIsEnabled ( / Validate System RAM used for decompressing the PEI and DXE firmware volumes when SEV-SNP is active. The PCDs SecValidatedStart and SecValidatedEnd are - set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + set in OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc. / VOID diff --git a/OvmfPkg/FvmainCompactScratchEnd.fdf.inc b/OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc similarity index 100% rename from OvmfPkg/FvmainCompactScratchEnd.fdf.inc rename to OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc diff --git a/OvmfPkg/OvmfPkgDefines.fdf.inc b/OvmfPkg/inc/OvmfPkgDefines.fdf.inc similarity index 100% rename from OvmfPkg/OvmfPkgDefines.fdf.inc rename to OvmfPkg/inc/OvmfPkgDefines.fdf.inc diff --git a/OvmfPkg/VarStore.fdf.inc b/OvmfPkg/inc/VarStore.fdf.inc similarity index 100% rename from OvmfPkg/VarStore.fdf.inc rename to OvmfPkg/inc/VarStore.fdf.inc diff --git a/OvmfPkg/XenElfHeader.fdf.inc b/OvmfPkg/inc/XenElfHeader.fdf.inc similarity index 100% rename from OvmfPkg/XenElfHeader.fdf.inc rename to OvmfPkg/inc/XenElfHeader.fdf.inc -- 2.38.1
More All Messages By This Member

1 - 1 of 1

1

Previous Topic Next Topic

Home Hashtags Subgroups Calendar About Features Pricing Updates Terms Help Twitter