diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2021-09-08 11:01:02 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-10-05 10:55:39 +0000 |
| commit | 4932f05a00e63103cb50f41b0403393ec5eeeb33 (patch) | |
| tree | adfbe0839da2401a2efde98b475f20f158120ebd | |
| parent | 606340fba3ee05a84b96588fc60de979f7762e46 (diff) | |
| download | edk2-4932f05a00e63103cb50f41b0403393ec5eeeb33.tar.gz edk2-4932f05a00e63103cb50f41b0403393ec5eeeb33.tar.bz2 edk2-4932f05a00e63103cb50f41b0403393ec5eeeb33.zip | |
OvmfPkg/Microvm: rename output files, fix includes
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>
| -rw-r--r-- | OvmfPkg/Microvm/MicrovmX64.dsc | 8 | ||||
| -rw-r--r-- | OvmfPkg/Microvm/MicrovmX64.fdf | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index e56b83d95e..97a8d90d74 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -15,15 +15,15 @@ #
################################################################################
[Defines]
- PLATFORM_NAME = Ovmf
- PLATFORM_GUID = 5a9e7754-d81b-49ea-85ad-69eaa7b1539b
+ PLATFORM_NAME = Microvm
+ PLATFORM_GUID = 55a5d2cc-6ca6-47d1-8f4f-5588d7705194
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x00010005
- OUTPUT_DIRECTORY = Build/OvmfX64
+ OUTPUT_DIRECTORY = Build/MicrovmX64
SUPPORTED_ARCHITECTURES = X64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
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.
diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 23936242e7..5c1b85792e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -11,20 +11,20 @@ ################################################################################
[Defines]
-!include OvmfPkgDefines.fdf.inc
+!include OvmfPkg/OvmfPkgDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
# image.
#
-[FD.OVMF]
+[FD.MICROVM]
BaseAddress = $(FW_BASE_ADDRESS)
Size = $(FW_SIZE)
ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(FW_BLOCKS)
-!include VarStore.fdf.inc
+!include OvmfPkg/VarStore.fdf.inc
$(VARS_SIZE)|$(FVMAIN_SIZE)
FV = FVMAIN_COMPACT
@@ -36,16 +36,16 @@ FV = SECFV # Build the variable store and the firmware code as separate flash device
# images.
#
-[FD.OVMF_VARS]
+[FD.MICROVM_VARS]
BaseAddress = $(FW_BASE_ADDRESS)
Size = $(VARS_SIZE)
ErasePolarity = 1
BlockSize = $(BLOCK_SIZE)
NumBlocks = $(VARS_BLOCKS)
-!include VarStore.fdf.inc
+!include OvmfPkg/VarStore.fdf.inc
-[FD.OVMF_CODE]
+[FD.MICROVM_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
Size = $(CODE_SIZE)
ErasePolarity = 1
@@ -427,7 +427,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { }
}
-!include FvmainCompactScratchEnd.fdf.inc
+!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc
################################################################################
|