diff options
| author | Maureen Helm <maureen.helm@intel.com> | 2022-01-03 10:22:46 -0600 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-01-06 14:09:39 +1100 |
| commit | c6d26bc524a2025f7721a889c36276570e355b0c (patch) | |
| tree | 738c50a8a282fcba692b39216be9b7f0fb20097d | |
| parent | 0cf03bd3b1fbaa3c025b50b1329286af448a41a6 (diff) | |
| download | micropython-c6d26bc524a2025f7721a889c36276570e355b0c.tar.gz micropython-c6d26bc524a2025f7721a889c36276570e355b0c.zip | |
zephyr: Upgrade to Zephyr v2.7.0.
Updates the Zephyr port build instructions and CI to use the latest
Zephyr release tag.
Signed-off-by: Maureen Helm <maureen.helm@intel.com>
| -rw-r--r-- | docs/zephyr/tutorial/repl.rst | 4 | ||||
| -rw-r--r-- | ports/zephyr/README.md | 6 | ||||
| -rwxr-xr-x | tools/ci.sh | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst index a7e8955d0b..71e732e610 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 v2.6.0-rc1-416-g3056c5ec30ad *** - MicroPython v2.6.0-rc1-416-g3056c5ec30 on 2021-06-24; zephyr-frdm_k64f with mk64f12 + *** Booting Zephyr OS build zephyr-v2.7.0 *** + MicroPython v1.17-288-gb695f5a70-dirty on 2022-01-03; zephyr-frdm_k64f with mk64f12 Type "help()" for more information. >>> diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md index e0b02af222..6b1c7ddd5f 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 v2.6.0, and may also work on higher +This port requires Zephyr version v2.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 v2.6.0 + $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.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 v2.6.0 + $ git checkout v2.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 5312de8a94..b8820950bf 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -605,6 +605,7 @@ function ci_windows_build { ZEPHYR_DOCKER_VERSION=v0.21.0 ZEPHYR_SDK_VERSION=0.13.2 +ZEPHYR_VERSION=v2.7.0 function ci_zephyr_setup { docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION} @@ -619,7 +620,7 @@ function ci_zephyr_setup { } function ci_zephyr_install { - docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject + docker exec zephyr-ci west init --mr ${ZEPHYR_VERSION} /zephyrproject docker exec -w /zephyrproject zephyr-ci west update docker exec -w /zephyrproject zephyr-ci west zephyr-export } |