* [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files
@ 2022-06-02 9:35 Gerd Hoffmann
2022-06-02 11:01 ` Yao, Jiewen
0 siblings, 1 reply; 3+ messages in thread
From: Gerd Hoffmann @ 2022-06-02 9:35 UTC (permalink / raw)
To: devel
Cc: Jiewen Yao, Oliver Steffen, Gerd Hoffmann, Ard Biesheuvel,
Jordan Justen, Pawel Polawski
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@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files
2022-06-02 9:35 [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files Gerd Hoffmann
@ 2022-06-02 11:01 ` Yao, Jiewen
2022-06-03 8:18 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Yao, Jiewen @ 2022-06-02 11:01 UTC (permalink / raw)
To: Gerd Hoffmann, devel@edk2.groups.io
Cc: Oliver Steffen, Ard Biesheuvel, Justen, Jordan L, Pawel Polawski
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: Gerd Hoffmann <kraxel@redhat.com>
> Sent: Thursday, June 2, 2022 5:35 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Oliver Steffen
> <osteffen@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Justen, Jordan L <jordan.l.justen@intel.com>;
> Pawel Polawski <ppolawsk@redhat.com>
> 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@redhat.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files
2022-06-02 11:01 ` Yao, Jiewen
@ 2022-06-03 8:18 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2022-06-03 8:18 UTC (permalink / raw)
To: Yao, Jiewen
Cc: Gerd Hoffmann, devel@edk2.groups.io, Oliver Steffen,
Ard Biesheuvel, Justen, Jordan L, Pawel Polawski
On Thu, 2 Jun 2022 at 13:01, Yao, Jiewen <jiewen.yao@intel.com> wrote:
>
> Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
>
Merged as #2939. Thanks.
> > -----Original Message-----
> > From: Gerd Hoffmann <kraxel@redhat.com>
> > Sent: Thursday, June 2, 2022 5:35 PM
> > To: devel@edk2.groups.io
> > Cc: Yao, Jiewen <jiewen.yao@intel.com>; Oliver Steffen
> > <osteffen@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; Ard Biesheuvel
> > <ardb+tianocore@kernel.org>; Justen, Jordan L <jordan.l.justen@intel.com>;
> > Pawel Polawski <ppolawsk@redhat.com>
> > 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@redhat.com>
> > ---
> > 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-03 8:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-02 9:35 [PATCH 1/1] OvmfPkg/Microvm: drop CODE and VARS files Gerd Hoffmann
2022-06-02 11:01 ` Yao, Jiewen
2022-06-03 8:18 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox