sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OvmfPkg/Microvm: rename output files, fix includes

Browse Source 
Rename the firmware volume files (s/OVMF/MICROVM/).
Fix includes so they work with microvm config being in a subdirectory.
With this patch applied the build works.

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3599
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
This commit is contained in:
Gerd Hoffmann
2021-09-08 11:01:02 +02:00
committed by mergify[bot]
parent 606340fba3
commit 4932f05a00
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OvmfPkg/Microvm/MicrovmX64.dsc
View File

@ -15,15 +15,15 @@
# #
################################################################################ ################################################################################
[Defines] [Defines]
PLATFORM_NAME = Ovmf PLATFORM_NAME = Microvm
PLATFORM_GUID = 5a9e7754-d81b-49ea-85ad-69eaa7b1539b PLATFORM_GUID = 55a5d2cc-6ca6-47d1-8f4f-5588d7705194
PLATFORM_VERSION = 0.1 PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x00010005 DSC_SPECIFICATION = 0x00010005
OUTPUT_DIRECTORY = Build/OvmfX64 OUTPUT_DIRECTORY = Build/MicrovmX64
SUPPORTED_ARCHITECTURES = X64 SUPPORTED_ARCHITECTURES = X64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = OvmfPkg/OvmfPkgX64.fdf FLASH_DEFINITION = OvmfPkg/Microvm/MicrovmX64.fdf
# #
# Defines for default states. These can be changed on the command line. # Defines for default states. These can be changed on the command line.

14
OvmfPkg/Microvm/MicrovmX64.fdf
View File

@ -11,20 +11,20 @@
################################################################################ ################################################################################
[Defines] [Defines]
!include OvmfPkgDefines.fdf.inc !include OvmfPkg/OvmfPkgDefines.fdf.inc
# #
# Build the variable store and the firmware code as one unified flash device # Build the variable store and the firmware code as one unified flash device
# image. # image.
# #
[FD.OVMF] [FD.MICROVM]
BaseAddress = $(FW_BASE_ADDRESS) BaseAddress = $(FW_BASE_ADDRESS)
Size = $(FW_SIZE) Size = $(FW_SIZE)
ErasePolarity = 1 ErasePolarity = 1
BlockSize = $(BLOCK_SIZE) BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS) NumBlocks = $(FW_BLOCKS)
!include VarStore.fdf.inc !include OvmfPkg/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE) $(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT FV = FVMAIN_COMPACT
@ -36,16 +36,16 @@ FV = SECFV
# Build the variable store and the firmware code as separate flash device # Build the variable store and the firmware code as separate flash device
# images. # images.
# #
[FD.OVMF_VARS] [FD.MICROVM_VARS]
BaseAddress = $(FW_BASE_ADDRESS) BaseAddress = $(FW_BASE_ADDRESS)
Size = $(VARS_SIZE) Size = $(VARS_SIZE)
ErasePolarity = 1 ErasePolarity = 1
BlockSize = $(BLOCK_SIZE) BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS) NumBlocks = $(VARS_BLOCKS)
!include VarStore.fdf.inc !include OvmfPkg/VarStore.fdf.inc
[FD.OVMF_CODE] [FD.MICROVM_CODE]
BaseAddress = $(CODE_BASE_ADDRESS) BaseAddress = $(CODE_BASE_ADDRESS)
Size = $(CODE_SIZE) Size = $(CODE_SIZE)
ErasePolarity = 1 ErasePolarity = 1
@ -427,7 +427,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
} }
} }
!include FvmainCompactScratchEnd.fdf.inc !include OvmfPkg/FvmainCompactScratchEnd.fdf.inc
################################################################################ ################################################################################