Skip to content

Commit 78df734

Browse files
authored
Merge pull request #158 from pillo79/pr-4.2.0
Switch to the official 4.2.0 release of Zephyr
2 parents e30c16f + 0f4bde4 commit 78df734

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

extra/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,15 @@ line_comment_only='^\s*\/\*' # match lines starting with comment
8282
line_continuation='\\$' # match lines ending with '\'
8383
c_comment='\s*\/\*.*?\*\/' # match C-style comments and any preceding space
8484
perl -i -pe "s/${c_comment}//gs unless /${line_preproc_ok}/ || (/${line_comment_only}/ && !/${line_continuation}/)" $(find ${VARIANT_DIR}/llext-edk/include/ -type f)
85+
8586
for ext in elf bin hex; do
8687
rm -f firmwares/zephyr-$variant.$ext
8788
if [ -f ${BUILD_DIR}/zephyr/zephyr.$ext ]; then
8889
cp ${BUILD_DIR}/zephyr/zephyr.$ext firmwares/zephyr-$variant.$ext
8990
fi
9091
done
92+
cp ${BUILD_DIR}/zephyr/zephyr.dts firmwares/zephyr-$variant.dts
93+
cp ${BUILD_DIR}/zephyr/.config firmwares/zephyr-$variant.config
9194

9295
# Generate the provides.ld file for linked builds
9396
echo "Generating exported symbol scripts"

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ manifest:
2121
projects:
2222
- name: zephyr
2323
remote: arduino
24-
revision: zephyr-arduino-20250714
24+
revision: zephyr-arduino-v4.2.0
2525
import:
2626
name-allowlist:
2727
- cmsis

0 commit comments

Comments
 (0)