From bd5ff6e581ad29a81040719fbc7e85f3835e3a32 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 11 Nov 2025 08:41:16 -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 --- CHANGELOG.md | 4 ++++ scripts/_build/ec.sh | 2 +- scripts/build.sh | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18b45557..c36fba46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ features apply to your model and firmware version, see the ## unreleased +- Changed the EC version to be distinct from the SBIOS version + +## 2025-08-11 + - lemp11: Fixed memory init ## 2025-07-29 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 96a65b0c..fea7f0ea 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -83,8 +83,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