Skip to content

Commit

Permalink
zephyr: Upgrade to Zephyr v2.7.0.
Browse files Browse the repository at this point in the history
Updates the Zephyr port build instructions and CI to use the latest
Zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
  • Loading branch information
MaureenHelm authored and dpgeorge committed Jan 6, 2022
1 parent 0cf03bd commit c6d26bc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/zephyr/tutorial/repl.rst
Expand Up @@ -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.
>>>

Expand Down
6 changes: 3 additions & 3 deletions ports/zephyr/README.md
Expand Up @@ -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).
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion tools/ci.sh
Expand Up @@ -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}
Expand All @@ -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
}
Expand Down

0 comments on commit c6d26bc

Please sign in to comment.