]> xenbits.xensource.com Git - xen.git/commitdiff
tools/firmware/ovmf: Use OvmfXen platform file is exist stable-4.11 staging-4.11
authorAnthony PERARD <anthony.perard@citrix.com>
Tue, 1 Jun 2021 10:28:03 +0000 (11:28 +0100)
committerIan Jackson <iwj@xenproject.org>
Tue, 31 Aug 2021 09:45:58 +0000 (10:45 +0100)
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 <anthony.perard@citrix.com>
Acked-by: Ian Jackson <iwj@xenproject.org>
(cherry picked from commit aad7b5c11d51d57659978e04702ac970906894e8)
(cherry picked from commit 7988ef515a5eabe74bb5468c8c692e03ee9db8bc)
(cherry picked from commit 0aabe44d9c454c265b2bfc1030d58bd8f9ca8c94)
(cherry picked from commit b335a5314f251c570f991376a1500737d3e02bb8)
(cherry picked from commit 7dadebd8d2c8c2a42d0ff3f022a63d6225297058)

tools/firmware/ovmf-makefile

index 55f999214545a2890688a5ac46708f19217ed074..637ee509c366603ac4bd0bb0a223880b9e416958 100644 (file)
@@ -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: