Skip to content

Commit 57a15b7

Browse files
committed
scripts: Version EC separately from SBIOS
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]>
1 parent 51e3e1a commit 57a15b7

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

scripts/_build/ec.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ while read line; do
1515
fi
1616
done < "$1"
1717

18-
source "$1"
19-
make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" clean
20-
make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" -j "$(nproc)"
21-
cp "ec/build/${BOARD}/${VERSION}/ec.rom" "$2"
18+
make -C ec clean
19+
make -C ec "${EC_ARGS[@]}" BUILD=build -j "$(nproc)"
20+
cp "ec/build/ec.rom" "$2"

scripts/build.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ KERNELVERSION="${VERSION}" \
8686
# Rebuild EC firmware for System76 EC models
8787
if [ ! -e "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/ec.config" ]
8888
then
89-
env VERSION="${VERSION}" \
90-
./scripts/_build/ec.sh \
89+
./scripts/_build/ec.sh \
9190
"${MODEL_DIR}/ec.config" \
9291
"${BUILD}/ec.rom"
9392
fi

0 commit comments

Comments
 (0)