Acked-by: Jiewen Yao <Jiewen.yao@...>

-----Original Message-----
From: Gerd Hoffmann <kraxel@...>
Sent: Thursday, June 2, 2022 5:35 PM
To: devel@edk2.groups.io
Cc: Yao, Jiewen <jiewen.yao@...>; Oliver Steffen
<osteffen@...>; Gerd Hoffmann <kraxel@...>; Ard Biesheuvel
<ardb+tianocore@...>; Justen, Jordan L <jordan.l.justen@...>;
Pawel Polawski <ppolawsk@...>
Subject: [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files

microvm doesn't support pflash and loads the firmware via -bios,
so we can't use the separate CODE and VARS files. Remove them.

Signed-off-by: Gerd Hoffmann <kraxel@...>
---
OvmfPkg/Microvm/MicrovmX64.fdf | 26 --------------------------
1 file changed, 26 deletions(-)

diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf
b/OvmfPkg/Microvm/MicrovmX64.fdf
index 3adb492a4ad7..ff0aab2bcb9e 100644
--- a/OvmfPkg/Microvm/MicrovmX64.fdf
+++ b/OvmfPkg/Microvm/MicrovmX64.fdf
@@ -32,32 +32,6 @@ [FD.MICROVM]
$(SECFV_OFFSET)|$(SECFV_SIZE)
FV = SECFV

-#
-# Build the variable store and the firmware code as separate flash device
-# images.
-#
-[FD.MICROVM_VARS]
-BaseAddress = $(FW_BASE_ADDRESS)
-Size = $(VARS_SIZE)
-ErasePolarity = 1
-BlockSize = $(BLOCK_SIZE)
-NumBlocks = $(VARS_BLOCKS)
-
-!include OvmfPkg/VarStore.fdf.inc
-
-[FD.MICROVM_CODE]
-BaseAddress = $(CODE_BASE_ADDRESS)
-Size = $(CODE_SIZE)
-ErasePolarity = 1
-BlockSize = $(BLOCK_SIZE)
-NumBlocks = $(CODE_BLOCKS)
-
-0x00000000|$(FVMAIN_SIZE)
-FV = FVMAIN_COMPACT
-
-$(FVMAIN_SIZE)|$(SECFV_SIZE)
-FV = SECFV
-

#################################################################
###############

[FD.MEMFD]
--
2.36.1