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: f4f4d5b ("Build EC as a submodule, specifying version")
Signed-off-by: Tim Crawford <[email protected]>

CHANGELOG.md

@@ -9,6 +9,7 @@ features apply to your model and firmware version, see the
 ## unreleased
 
 - tgl-u: Fixed CPU not going lower than C2 due to card reader LTR
+- Changed the EC version to be distinct from the SBIOS version
 
 ## 2023-10-13
 

scripts/_build/ec.sh

@@ -18,5 +18,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"

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