From 8632d8e3a9ae9720424d26001faeca1344538cf8 Mon Sep 17 00:00:00 2001
From: Hadi Moshayedi <hadi@ubicloud.com>
Date: Wed, 28 Feb 2024 11:12:08 -0800
Subject: [PATCH] Disable the "Press ESCAPE for boot options" prompt in arm64

We had few seconds of delay in arm64 VMs waiting for "Press ESCAPE for
boot options". We can improve the provisioning time by disabling that.
---
 build-edk2 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-edk2 b/build-edk2
index a8cc266..6b248b5 100755
--- a/build-edk2
+++ b/build-edk2
@@ -12,8 +12,8 @@
 # sudo -- bash -c 'apt-get update && apt-get install -y make gcc g++ flex bison nasm m4 uuid-dev g++'
 
 WORKLOADS_DIR="$(pwd)"
-EDK2_COMMIT="8736b8fdca85e02933cdb0a13309de14c9799ece"
-EDK2_PLAT_COMMIT="b5fa396700e728c0e18b512229226f65337bf74a"
+EDK2_COMMIT="edc6681206c1a8791981a2f911d2fb8b3d2f5768"
+EDK2_PLAT_COMMIT="103c88ba5b0c6259fc674e6358c68a85e882e41b"
 ACPICA_COMMIT="f16a0b4d0f0edd7b78a332fcf507be2187fac21e"
 
 set -uex
@@ -104,6 +104,8 @@ build_edk2() {
             build -a X64 -t GCC5 -p OvmfPkg/CloudHv/CloudHvX64.dsc -b RELEASE -n 0
             cp Build/CloudHvX64/RELEASE_GCC5/FV/CLOUDHV.fd "$WORKLOADS_DIR/CLOUDHV-x64.fd"
         elif [ "$architecture" = "aarch64" ]; then
+            # We don't need the "Press ESCAPE for boot options" prompt
+            sed -i 's/\(gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|\)[0-9]\+/\10/g' ArmVirtPkg/ArmVirtCloudHv.dsc
             build -a AARCH64 -t GCC5 -p ArmVirtPkg/ArmVirtCloudHv.dsc -b RELEASE -n 0
             cp Build/ArmVirtCloudHv-AARCH64/RELEASE_GCC5/FV/CLOUDHV_EFI.fd "$WORKLOADS_DIR/CLOUDHV-arm64.fd"
         else