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>

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

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