OvmfPkg: CloudHv: Remove VARS and CODE sections

CloudHv doesn't need any VARS store, and it doesn't need the CODE
section to be generated separately either. The only thing needed is to
generate a firmware binary that can be used by Cloud Hypervisor.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index ce3302c6d6ed1155ca2db43292998d7694eb7a44..0974e76ac8d7b5f32331ca88be8dba87b18da87a 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -24,38 +24,10 @@ ErasePolarity = 1
 BlockSize     = $(BLOCK_SIZE)\r
 NumBlocks     = $(FW_BLOCKS)\r
 \r
-!include OvmfPkg/VarStore.fdf.inc\r
-\r
-$(VARS_SIZE)|$(FVMAIN_SIZE)\r
-FV = FVMAIN_COMPACT\r
-\r
-$(SECFV_OFFSET)|$(SECFV_SIZE)\r
-FV = SECFV\r
-\r
-#\r
-# Build the variable store and the firmware code as separate flash device\r
-# images.\r
-#\r
-[FD.CLOUDHV_VARS]\r
-BaseAddress   = $(FW_BASE_ADDRESS)\r
-Size          = $(VARS_SIZE)\r
-ErasePolarity = 1\r
-BlockSize     = $(BLOCK_SIZE)\r
-NumBlocks     = $(VARS_BLOCKS)\r
-\r
-!include OvmfPkg/VarStore.fdf.inc\r
-\r
-[FD.CLOUDHV_CODE]\r
-BaseAddress   = $(CODE_BASE_ADDRESS)\r
-Size          = $(CODE_SIZE)\r
-ErasePolarity = 1\r
-BlockSize     = $(BLOCK_SIZE)\r
-NumBlocks     = $(CODE_BLOCKS)\r
-\r
 0x00000000|$(FVMAIN_SIZE)\r
 FV = FVMAIN_COMPACT\r
 \r
-$(FVMAIN_SIZE)|$(SECFV_SIZE)\r
+$(SECFV_OFFSET)|$(SECFV_SIZE)\r
 FV = SECFV\r
 \r
 ################################################################################\r