From: Anthony PERARD Date: Tue, 1 Jun 2021 10:28:03 +0000 (+0100) Subject: tools/firmware/ovmf: Use OvmfXen platform file is exist X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~468 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aad7b5c11d51d57659978e04702ac970906894e8;p=xen.git tools/firmware/ovmf: Use OvmfXen platform file is exist A platform introduced in EDK II named OvmfXen is now the one to use for Xen instead of OvmfX64. It comes with PVH support. Also, the Xen support in OvmfX64 is deprecated, "deprecation notice: *dynamic* multi-VMM (QEMU vs. Xen) support in OvmfPkg" https://edk2.groups.io/g/devel/message/75498 Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile index 55f9992145..637ee509c3 100644 --- a/tools/firmware/ovmf-makefile +++ b/tools/firmware/ovmf-makefile @@ -17,8 +17,14 @@ all: build .PHONY: build build: if test -e .git ; then $(GIT) submodule update --init --recursive ; fi - OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4 - cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin + set -ex; \ + if test -e OvmfPkg/OvmfXen.dsc; then \ + OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4 -p OvmfPkg/OvmfXen.dsc; \ + cp Build/OvmfXen/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin; \ + else \ + OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4; \ + cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin; \ + fi .PHONY: clean clean: