tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mv OvmfPkg: move fdf include snippets to Include/Fdf 

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:48 +08:00 committed by mergify[bot]
parent 5eb973eb62
commit 1ef86f1201
16 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OvmfPkg/AmdSev/AmdSevX64.fdf
View File

@ -11,7 +11,7 @@
################################################################################
[Defines]
!include OvmfPkg/OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include OvmfPkg/VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -351,7 +351,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

6
OvmfPkg/Bhyve/BhyveX64.fdf
View File

@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -43,7 +43,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
[FD.BHYVE_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@ -368,7 +368,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

2
OvmfPkg/CloudHv/CloudHvX64.fdf
View File

@ -378,7 +378,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

0
OvmfPkg/FvmainCompactScratchEnd.fdf.inc → OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
View File

0
OvmfPkg/OvmfPkgDefines.fdf.inc → OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
View File

0
OvmfPkg/VarStore.fdf.inc → OvmfPkg/Include/Fdf/VarStore.fdf.inc
View File

0
OvmfPkg/XenElfHeader.fdf.inc → OvmfPkg/Include/Fdf/XenElfHeader.fdf.inc
View File

2
OvmfPkg/Include/WorkArea.h
View File

@ -21,7 +21,7 @@
// sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER)
// PcdOvmfConfidentialComputingWorkAreaHeader defined in:
// OvmfPkg/OvmfPkg.dec
// OvmfPkg/OvmfPkgDefines.fdf.inc
// OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER {
UINT8 GuestType;
UINT8 Reserved1[3];

8
OvmfPkg/IntelTdx/IntelTdxX64.fdf
View File

@ -11,7 +11,7 @@
################################################################################
[Defines]
!include OvmfPkg/OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include OvmfPkg/VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -43,7 +43,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
!include OvmfPkg/VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@ -332,7 +332,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
# !include OvmfPkg/FvmainCompactScratchEnd.fdf.inc
# !include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

6
OvmfPkg/Microvm/MicrovmX64.fdf
View File

@ -11,7 +11,7 @@
################################################################################
[Defines]
!include OvmfPkg/OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include OvmfPkg/VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -335,7 +335,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

8
OvmfPkg/OvmfPkgIa32.fdf
View File

@ -11,7 +11,7 @@
################################################################################
[Defines]
!include OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -43,7 +43,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@ -410,7 +410,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

8
OvmfPkg/OvmfPkgIa32X64.fdf
View File

@ -11,7 +11,7 @@
################################################################################
[Defines]
!include OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -43,7 +43,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@ -413,7 +413,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

8
OvmfPkg/OvmfPkgX64.fdf
View File

@ -11,7 +11,7 @@
################################################################################
[Defines]
!include OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
@ -24,7 +24,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@ -43,7 +43,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@ -440,7 +440,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

8
OvmfPkg/OvmfXen.fdf
View File

@ -12,7 +12,7 @@
################################################################################
[Defines]
!include OvmfPkgDefines.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
#
# This will allow the flash device image to be recognize as an ELF, with first
@ -32,7 +32,7 @@ NumBlocks = $(FW_BLOCKS)
0x00000000|0x00040000
!endif
!include XenElfHeader.fdf.inc
!include OvmfPkg/Include/Fdf/XenElfHeader.fdf.inc
!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)
0x0000e000|0x00001000
@ -86,7 +86,7 @@ ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
!include VarStore.fdf.inc
!include OvmfPkg/Include/Fdf/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@ -388,7 +388,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
}
}
!include FvmainCompactScratchEnd.fdf.inc
!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc
################################################################################

2
OvmfPkg/Sec/AmdSev.c
View File

@ -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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc.
**/
VOID

2
OvmfPkg/Sec/AmdSev.h
View File

@ -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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc.
**/
VOID