Commit c6d26bc5 authored by Maureen Helm's avatar Maureen Helm Committed by Damien George

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: default avatarMaureen Helm <maureen.helm@intel.com>
parent 0cf03bd3
...@@ -31,8 +31,8 @@ With your serial program open (PuTTY, screen, picocom, etc) you may see a ...@@ -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 blank screen with a flashing cursor. Press Enter (or reset the board) and
you should be presented with the following text:: you should be presented with the following text::
*** Booting Zephyr OS build v2.6.0-rc1-416-g3056c5ec30ad *** *** Booting Zephyr OS build zephyr-v2.7.0 ***
MicroPython v2.6.0-rc1-416-g3056c5ec30 on 2021-06-24; zephyr-frdm_k64f with mk64f12 MicroPython v1.17-288-gb695f5a70-dirty on 2022-01-03; zephyr-frdm_k64f with mk64f12
Type "help()" for more information. Type "help()" for more information.
>>> >>>
......
...@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS ...@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
This is a work-in-progress port of MicroPython to Zephyr RTOS This is a work-in-progress port of MicroPython to Zephyr RTOS
(http://zephyrproject.org). (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 versions. All boards supported
by Zephyr (with standard level of features support, like UART console) by Zephyr (with standard level of features support, like UART console)
should work with MicroPython (but not all were tested). should work with MicroPython (but not all were tested).
...@@ -39,13 +39,13 @@ setup is correct. ...@@ -39,13 +39,13 @@ setup is correct.
If you already have Zephyr installed but are having issues building the If you already have Zephyr installed but are having issues building the
MicroPython port then try installing the correct version of Zephyr via: 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 Alternatively, you don't have to redo the Zephyr installation to just
switch from master to a tagged release, you can instead do: switch from master to a tagged release, you can instead do:
$ cd zephyrproject/zephyr $ cd zephyrproject/zephyr
$ git checkout v2.6.0 $ git checkout v2.7.0
$ west update $ west update
With Zephyr installed you may then need to configure your environment, With Zephyr installed you may then need to configure your environment,
......
...@@ -605,6 +605,7 @@ function ci_windows_build { ...@@ -605,6 +605,7 @@ function ci_windows_build {
ZEPHYR_DOCKER_VERSION=v0.21.0 ZEPHYR_DOCKER_VERSION=v0.21.0
ZEPHYR_SDK_VERSION=0.13.2 ZEPHYR_SDK_VERSION=0.13.2
ZEPHYR_VERSION=v2.7.0
function ci_zephyr_setup { function ci_zephyr_setup {
docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION} docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
...@@ -619,7 +620,7 @@ function ci_zephyr_setup { ...@@ -619,7 +620,7 @@ function ci_zephyr_setup {
} }
function ci_zephyr_install { 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 update
docker exec -w /zephyrproject zephyr-ci west zephyr-export docker exec -w /zephyrproject zephyr-ci west zephyr-export
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment