From 1d973574fe824183d3a53ee135d4b83ec15a936d Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Tue, 23 Jan 2024 08:46:15 -0700
Subject: [PATCH] scripts: Version EC separately from SBIOS

The original rationale for having the EC version match the SBIOS version
was to ensure that compatible versions of each were installed. So we set
the EC version to the SBIOS version and always flash both of them, even
if only one actually changed.

At some point, a mechanism should be implemented that checks for a
minimum supported/compatible version. This would be comparable to the
LVFS MetaInfo's "requires" field.

Ref: f4f4d5b61dbe ("Build EC as a submodule, specifying version")
Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 CHANGELOG.md         | 1 +
 scripts/_build/ec.sh | 2 +-
 scripts/build.sh     | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d85d4dc2..2845964c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ features apply to your model and firmware version, see the
 - adl: Fixed PCIe 4.0 drives in PCIe 3.0 slot failing to initialize on resume
 - rpl: Fixed PCIe 4.0 drives in PCIe 3.0 slot failing to initialize on resume
 - rpl: Fixed TCSS ACPI access
+- Changed the EC version to be distinct from the SBIOS version
 
 ## 2024-01-18
 
diff --git a/scripts/_build/ec.sh b/scripts/_build/ec.sh
index 15937722..397ac1d4 100755
--- a/scripts/_build/ec.sh
+++ b/scripts/_build/ec.sh
@@ -20,5 +20,5 @@ done < "$1"
 BUILD_DIR="build"
 
 make -C ec BUILD="$BUILD_DIR" clean
-make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" BUILD="$BUILD_DIR" -j "$(nproc)"
+make -C ec "${EC_ARGS[@]}" BUILD="$BUILD_DIR" -j "$(nproc)"
 cp "ec/$BUILD_DIR/ec.rom" "$2"
diff --git a/scripts/build.sh b/scripts/build.sh
index b491adfe..661a9c5f 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -87,8 +87,7 @@ KERNELVERSION="${VERSION}" \
 # Rebuild EC firmware for System76 EC models
 if [ ! -e  "${MODEL_DIR}/ec.rom" ] && [ -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