From 365bc2d37461ef03301742c2c15648f0cd9a83a9 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Tue, 3 Oct 2023 09:46:32 -0600
Subject: [PATCH] scripts: Version EC separately from SBIOS

Stop setting the EC version to the SBIOS version so that the EC will use
its real version.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 ec                   | 2 +-
 scripts/_build/ec.sh | 6 +++---
 scripts/build.sh     | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ec b/ec
index 181d4c5d..c461e20d 160000
--- a/ec
+++ b/ec
@@ -1 +1 @@
-Subproject commit 181d4c5d595b9bf9b838b6a0c96468df3e913162
+Subproject commit c461e20df3643866e4a8169f283b57b2aa9f3493
diff --git a/scripts/_build/ec.sh b/scripts/_build/ec.sh
index 9adfeb0c..31f9d03c 100755
--- a/scripts/_build/ec.sh
+++ b/scripts/_build/ec.sh
@@ -16,6 +16,6 @@ while read line; do
 done < "$1"
 
 source "$1"
-make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" clean
-make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" -j "$(nproc)"
-cp "ec/build/${BOARD}/${VERSION}/ec.rom" "$2"
+make -C ec clean
+make -C ec "${EC_ARGS[@]}" -j "$(nproc)"
+cp "ec/build/${BOARD}/ec.rom" "$2"
diff --git a/scripts/build.sh b/scripts/build.sh
index a63de80e..4bb197fd 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -86,8 +86,7 @@ KERNELVERSION="${VERSION}" \
 # Rebuild EC firmware for System76 EC models
 if [ ! -e  "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/ec.config" ]
 then
-    env VERSION="${VERSION}" \
-        ./scripts/_build/ec.sh \
+    ./scripts/_build/ec.sh \
         "${MODEL_DIR}/ec.config" \
         "${BUILD}/ec.rom"
 fi