diff mbox series

[05/11] edk2: add microvm build

Message ID 20220308145521.3106395-6-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show
Series edk2: update to stable202202 | expand

Commit Message

Gerd Hoffmann March 8, 2022, 2:55 p.m. UTC
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/Makefile.edk2 | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Philippe Mathieu-Daudé March 8, 2022, 3:04 p.m. UTC | #1
On 8/3/22 15:55, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   roms/Makefile.edk2 | 11 +++++++++++
>   1 file changed, 11 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Alex Bennée March 9, 2022, 11:55 a.m. UTC | #2
Gerd Hoffmann <kraxel@redhat.com> writes:

> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Out of interest how do you usually trigger these builds?

➜  make pc-bios/edk2-x86_64-microvm.fd
  GIT     ui/keycodemapdb meson tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 dtc capstone slirp
make: *** No rule to make target 'pc-bios/edk2-x86_64-microvm.fd'.  Stop.

Gerd Hoffmann March 9, 2022, 12:12 p.m. UTC | #3
On Wed, Mar 09, 2022 at 11:55:26AM +0000, Alex Bennée wrote:
> 
> Gerd Hoffmann <kraxel@redhat.com> writes:
> 
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> Out of interest how do you usually trigger these builds?

make -C roms efi

(try "make -C roms help" for all firmware build targets).

HTH,
  Gerd
Philippe Mathieu-Daudé March 9, 2022, 12:21 p.m. UTC | #4
On 9/3/22 13:12, Gerd Hoffmann wrote:
> On Wed, Mar 09, 2022 at 11:55:26AM +0000, Alex Bennée wrote:
>>
>> Gerd Hoffmann <kraxel@redhat.com> writes:
>>
>>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>>
>> Out of interest how do you usually trigger these builds?
> 
> make -C roms efi
> 
> (try "make -C roms help" for all firmware build targets).

See also the 'build-edk2' job in .gitlab-ci.d/edk2.yml.
Ani Sinha March 9, 2022, 1:30 p.m. UTC | #5
On Wed, Mar 9, 2022 at 5:43 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> On Wed, Mar 09, 2022 at 11:55:26AM +0000, Alex Bennée wrote:
> >
> > Gerd Hoffmann <kraxel@redhat.com> writes:
> >
> > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> >
> > Out of interest how do you usually trigger these builds?
>
> make -C roms efi

Ah good to know. I used instructions here last time:
https://wiki.ubuntu.com/UEFI/EDK2

>
> (try "make -C roms help" for all firmware build targets).
>
> HTH,
>   Gerd
>
diff mbox series

Patch

diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index a669019fe5b2..57996c968687 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -33,6 +33,7 @@  flashdevs := \
 	i386-secure-code \
 	x86_64-code \
 	x86_64-secure-code \
+	x86_64-microvm \
 	\
 	arm-vars \
 	i386-vars
@@ -145,6 +146,16 @@  submodules:
 		-D SMM_REQUIRE
 	cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
 
+../pc-bios/edk2-x86_64-microvm.fd: submodules
+	+./edk2-build.sh \
+		x86_64 \
+		--arch=X64 \
+		--platform=OvmfPkg/Microvm/MicrovmX64.dsc \
+		-D NETWORK_IP6_ENABLE \
+		-D NETWORK_HTTP_BOOT_ENABLE \
+		-D NETWORK_TLS_ENABLE
+	cp edk2/Build/MicrovmX64/$(target)_$(call toolchain,x86_64)/FV/MICROVM.fd $@
+
 ../pc-bios/edk2-arm-vars.fd: ../pc-bios/edk2-arm-code.fd
 	cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_VARS.fd \
 		$@