summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMaureen Helm <maureen.helm@intel.com>2022-09-16 13:17:05 -0500
committerDamien George <damien@micropython.org>2024-10-02 07:49:53 +1000
commit545d4efb5590b0144e1f29e437d816a7b58aa40d (patch)
tree2f2890654a9ae6bde8930bc3dbb2d1df4d2eb4cc
parentfa7b4c48bcb45dae9009f73c3e3eae6d92f3e456 (diff)
downloadmicropython-545d4efb5590b0144e1f29e437d816a7b58aa40d.tar.gz
micropython-545d4efb5590b0144e1f29e437d816a7b58aa40d.zip
zephyr: Upgrade to Zephyr v3.7.0.
Updates the Zephyr port build instructions and CI to use the latest Zephyr release tag. Tested on frdm_k64f. Signed-off-by: Maureen Helm <maureen.helm@analog.com>
-rw-r--r--docs/zephyr/tutorial/repl.rst4
-rw-r--r--ports/zephyr/README.md6
-rwxr-xr-xtools/ci.sh2
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index 2c091f7ee9..db7b7333d2 100644
--- a/docs/zephyr/tutorial/repl.rst
+++ b/docs/zephyr/tutorial/repl.rst
@@ -31,8 +31,8 @@ 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 zephyr-v3.1.0 ***
- MicroPython v1.19.1-9-g4fd54a475 on 2022-06-17; zephyr-frdm_k64f with mk64f12
+ *** Booting Zephyr OS build v3.7.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 11cd0acfa2..39010b2ac9 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ 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.1.0, and may also work on higher
+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).
@@ -39,13 +39,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.1.0
+ $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.7.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.1.0
+ $ git checkout v3.7.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 1fd2ebc703..feb40cc4ff 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -729,7 +729,7 @@ function ci_windows_build {
ZEPHYR_DOCKER_VERSION=v0.26.13
ZEPHYR_SDK_VERSION=0.16.8
-ZEPHYR_VERSION=v3.1.0
+ZEPHYR_VERSION=v3.7.0
function ci_zephyr_setup {
docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}