Skip to content

Commit

Permalink
scripts: Version EC separately from SBIOS
Browse files Browse the repository at this point in the history 
Stop setting the EC version to the SBIOS version so that the EC will use
its real version.

Signed-off-by: Tim Crawford <[email protected]>
  • Loading branch information
@crawfxrd
crawfxrd committed Oct 3, 2023
1 parent 51e3e1a commit 365bc2d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ec
Submodule ec updated 4 files
+1 −1 Makefile
+1 −1 src/board/system76/common/pnp.c
+2 −2 src/common/include/common/version.h
+2 −2 src/common/version.c
6 changes: 3 additions & 3 deletions scripts/_build/ec.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 1 addition & 2 deletions scripts/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 365bc2d

Please sign in to comment.