8000 zephyr: Upgrade to Zephyr v3.6.0. · micropython/micropython@eecb0b4 · GitHub
[go: up one dir, main page]
Skip to content

Commit eecb0b4

Browse files
MaureenHelmMaureenHelm
committed
zephyr: Upgrade to Zephyr v3.6.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>
1 parent 3025a3d commit eecb0b4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

‎docs/zephyr/tutorial/repl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ With your serial program open (PuTTY, screen, picocom, etc) you may see a
3131
blank screen with a flashing cursor. Press Enter (or reset the board) and
3232
you should be presented with the following text::
3333

34-
*** Booting Zephyr OS build zephyr-v3.5.0 ***
35-
MicroPython v1.19.1-9-g4fd54a475 on 2022-06-17; zephyr-frdm_k64f with mk64f12
34+
*** Booting Zephyr OS build v3.6.0 ***
35+
MicroPython v1.23.0-preview.358.g6ac63cb44 on 2024-04-27; zephyr-frdm_k64f with mk64f12
3636
Type "help()" for more information.
3737
>>>
3838

‎ports/zephyr/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
44
This is a work-in-progress port of MicroPython to Zephyr RTOS
55
(http://zephyrproject.org).
66

7-
This port requires Zephyr version v3.5.0, and may also work on higher
7+
This port requires Zephyr version v3.6.0, and may also work on higher
88
versions. All boards supported
99
by Zephyr (with standard level of features support, like UART console)
1010
should work with MicroPython (but not all were tested).
@@ -39,13 +39,13 @@ setup is correct.
3939
If you already have Zephyr installed but are having issues building the
4040
MicroPython port then try installing the correct version of Zephyr via:
4141

42-
$ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.5.0
42+
$ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.6.0
4343

4444
Alternatively, you don't have to redo the Zephyr installation to just
4545
switch from master to a tagged release, you can instead do:
4646

4747
$ cd zephyrproject/zephyr
48-
$ git checkout v3.5.0
48+
$ git checkout v3.6.0
4949
$ west update
5050

5151
With Zephyr installed you may then need to configure your environment,

‎tools/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ function ci_windows_build {
686686

687687
ZEPHYR_DOCKER_VERSION=v0.26.7
688688
ZEPHYR_SDK_VERSION=0.16.5
689-
ZEPHYR_VERSION=v3.5.0
689+
ZEPHYR_VERSION=v3.6.0
690690

691691
function ci_zephyr_setup {
692692
docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}

0 commit comments

Comments
 (0)
0