From eebd24bec4149b8ace35f5f17ee2172870182453 Mon Sep 17 00:00:00 2001
From: Alex Carter <alex.carter@ibm.com>
Date: Tue, 21 Feb 2023 01:07:29 +0000
Subject: [PATCH] CC: Rename SEV firmware to AMDSEV.fd

Renaming the output binary from the AmdSevPkg from OVMF.fd to AMDSEV.fd so it does not conflict with the base x86_64 build.

Changing install name in ovmf static builder and the location in the sev config file.

Fixes: #6337
Signed-off-by: Alex Carter <Alex.Carter@ibm.com>
---
 src/runtime/Makefile                            | 2 +-
 tools/packaging/static-build/ovmf/build-ovmf.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index 7abcd4b832..1bbb3b2f85 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -124,7 +124,7 @@ FIRMWAREVOLUMEPATH :=
 TDVFFIRMWAREPATH := $(PREFIXDEPS)/share/tdvf/OVMF_CODE.fd
 TDVFFIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/tdvf/OVMF_VARS.fd
 TDSHIMFIRMWAREPATH := ${PREFIXDEPS}/share/td-shim/td-shim.bin
-SEVFIRMWAREPATH := $(PREFIXDEPS)/share/ovmf/OVMF.fd
+SEVFIRMWAREPATH := $(PREFIXDEPS)/share/ovmf/AMDSEV.fd
 
 AGENTCONFIGFILEPATH := /etc/agent-config.toml
 AGENTCONFIGFILEKERNELPARAM := agent.config_file=$(AGENTCONFIGFILEPATH)
diff --git a/tools/packaging/static-build/ovmf/build-ovmf.sh b/tools/packaging/static-build/ovmf/build-ovmf.sh
index 5477859ec4..8ffd4e0fde 100755
--- a/tools/packaging/static-build/ovmf/build-ovmf.sh
+++ b/tools/packaging/static-build/ovmf/build-ovmf.sh
@@ -84,7 +84,11 @@ if [ "${ovmf_build}" == "tdx" ]; then
 fi
 
 mkdir -p "${install_dir}"
-install $build_root/$ovmf_dir/"${build_path_fv}"/OVMF.fd "${install_dir}"
+if [ "${ovmf_build}" == "sev" ]; then
+	install $build_root/$ovmf_dir/"${build_path_fv}"/OVMF.fd "${install_dir}/AMDSEV.fd"
+else
+	install $build_root/$ovmf_dir/"${build_path_fv}"/OVMF.fd "${install_dir}"
+fi
 if [ "${ovmf_build}" == "tdx" ]; then
 	install $build_root/$ovmf_dir/"${build_path_fv}"/OVMF_CODE.fd ${install_dir}
 	install $build_root/$ovmf_dir/"${build_path_fv}"/OVMF_VARS.fd ${install_dir}