[xen staging-4.14] tools/firmware/ovmf: Use OvmfXen platform file is exist

[patchbot@xxxxxxx]

commit 74e93071826fe3aaab32e469280a3253a39147f6
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Tue Jun 1 11:28:03 2021 +0100
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Wed Aug 25 14:29:17 2021 +0100

    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 <anthony.perard@xxxxxxxxxx>
    Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
    (cherry picked from commit aad7b5c11d51d57659978e04702ac970906894e8)
    (cherry picked from commit 7988ef515a5eabe74bb5468c8c692e03ee9db8bc)
---
 tools/firmware/ovmf-makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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:
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.14