diff --git a/CHANGELOG.md b/CHANGELOG.md index b53a4cef..18446911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ date followed by an underscore and a short git revision. To see if specific features apply to your model and firmware version, see the [feature matrix](./FEATURES.md). +## unreleased + +- Changed the EC version to be distinct from the SBIOS version + ## 2024-01-18 - darp9: Added SSD RTD3 configs to fix suspend with some drives 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 99a5118a..46d00cf9 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" ] && [ -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