From f1a4d89b742c3db8c3ee28ac67b26e3fa29e5ed4 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Tue, 10 Dec 2024 18:45:37 -0700
Subject: [PATCH] Update firmware apps

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 apps/firmware-setup  | 2 +-
 apps/firmware-update | 2 +-
 apps/gop-policy      | 2 +-
 scripts/build.sh     | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/firmware-setup b/apps/firmware-setup
index 2c0d4af..67d63a7 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit 2c0d4af9452019154c8352e90d4d0cfe519580e7
+Subproject commit 67d63a79b32e107d7c4527133c1d9a946649f145
diff --git a/apps/firmware-update b/apps/firmware-update
index 3ee4593..c7f7e89 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit 3ee45930bd663db5979b2d72a87bc16446a10711
+Subproject commit c7f7e89a34d66ed038b4e26f811f66a42e14c1e5
diff --git a/apps/gop-policy b/apps/gop-policy
index 59562e9..384aec7 160000
--- a/apps/gop-policy
+++ b/apps/gop-policy
@@ -1 +1 @@
-Subproject commit 59562e98774840605c80ed42347c473045cacf14
+Subproject commit 384aec788a0c39a334e4c81b4e224b99dd59e394
diff --git a/scripts/build.sh b/scripts/build.sh
index b491adf..5a5de31 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -39,7 +39,6 @@ EDK2_ARGS=(
 )
 
 # Rebuild firmware-setup (used by edk2)
-touch apps/firmware-setup/Cargo.toml
 make -C apps/firmware-setup
 EDK2_ARGS+=(
     -D FIRMWARE_OPEN_FIRMWARE_SETUP="firmware-setup/firmware-setup.inf"
@@ -48,7 +47,6 @@ EDK2_ARGS+=(
 # Rebuild gop-policy (used by edk2)
 if [ -e "${MODEL_DIR}/IntelGopDriver.inf" ] && [ -e "${MODEL_DIR}/vbt.rom" ]
 then
-    touch apps/gop-policy/Cargo.toml
     FIRMWARE_OPEN_VBT="${MODEL_DIR}/vbt.rom" \
         make -C apps/gop-policy
     EDK2_ARGS+=(
@@ -98,7 +96,6 @@ then
     # Rebuild firmware-update
     export BASEDIR="system76_${MODEL}_${VERSION}"
     pushd apps/firmware-update >/dev/null
-      rm -rf "build/x86_64-unknown-uefi"
       make "build/x86_64-unknown-uefi/boot.img"
       cp -v "build/x86_64-unknown-uefi/boot.img" "${USB}.partial"
     popd >/dev/null