summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaureen Helm <maureen.helm@analog.com>2024-11-10 08:24:02 -0600
committerDamien George <damien@micropython.org>2025-04-29 23:00:37 +1000
commit3c8d1b13f5b7e60e491e3a19734c237e1485e413 (patch)
tree5c497070ec6b42bcc61c944ec71e0ea5288359fd
parentb83606fe337614543f18f0ddf4a3250974b93d3c (diff)
zephyr: Upgrade to Zephyr v4.0.0.
Updates the Zephyr port build instructions. The CI is updated to use Zephyr docker image 0.27.4, SDK 0.17.0 and the latest Zephyr release tag. Tested on max32690fthr and frdm_k64f. Signed-off-by: Maureen Helm <maureen.helm@analog.com> Signed-off-by: Detlev Zundel <dzu@member.fsf.org>
-rw-r--r--docs/zephyr/tutorial/repl.rst2
-rw-r--r--ports/zephyr/README.md15
-rwxr-xr-xtools/ci.sh6
3 files changed, 13 insertions, 10 deletions
diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index db7b7333d..199dda2b7 100644
--- a/docs/zephyr/tutorial/repl.rst
+++ b/docs/zephyr/tutorial/repl.rst
@@ -31,7 +31,7 @@ With your serial program open (PuTTY, screen, picocom, etc) you may see a
blank screen with a flashing cursor. Press Enter (or reset the board) and
you should be presented with the following text::
- *** Booting Zephyr OS build v3.7.0 ***
+ *** Booting Zephyr OS build v4.0.0 ***
MicroPython v1.24.0-preview.179.g5b85b24bd on 2024-08-05; zephyr-frdm_k64f with mk64f12
Type "help()" for more information.
>>>
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 4590eb719..84adf9639 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,10 +4,13 @@ MicroPython port to Zephyr RTOS
This is a work-in-progress port of MicroPython to Zephyr RTOS
(http://zephyrproject.org).
-This port requires Zephyr version v3.7.0, and may also work on higher
-versions. All boards supported
-by Zephyr (with standard level of features support, like UART console)
-should work with MicroPython (but not all were tested).
+This port tries to support all Zephyr versions supported upstream,
+i.e. currently v3.7 (LTS), v4.0 and the development branch. The CI is
+setup to use the latest version, i.e. v4.0.
+
+All boards supported by Zephyr (with standard level of features
+support, like UART console) should work with MicroPython (but not all
+were tested).
Features supported at this time:
@@ -39,13 +42,13 @@ setup is correct.
If you already have Zephyr installed but are having issues building the
MicroPython port then try installing the correct version of Zephyr via:
- $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.7.0
+ $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v4.0.0
Alternatively, you don't have to redo the Zephyr installation to just
switch from master to a tagged release, you can instead do:
$ cd zephyrproject/zephyr
- $ git checkout v3.7.0
+ $ git checkout v4.0.0
$ west update
With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index cfc975483..6f8d1cb80 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -818,9 +818,9 @@ function ci_windows_build {
########################################################################################
# ports/zephyr
-ZEPHYR_DOCKER_VERSION=v0.26.13
-ZEPHYR_SDK_VERSION=0.16.8
-ZEPHYR_VERSION=v3.7.0
+ZEPHYR_DOCKER_VERSION=v0.27.4
+ZEPHYR_SDK_VERSION=0.17.0
+ZEPHYR_VERSION=v4.0.0
function ci_zephyr_setup {
IMAGE=ghcr.io/zephyrproject-rtos/ci:${ZEPHYR_DOCKER_VERSION}