Skip to content

Commit c6d26bc

Browse files
MaureenHelmdpgeorge
authored andcommitted
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>
1 parent 0cf03bd commit c6d26bc

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-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 v2.6.0-rc1-416-g3056c5ec30ad ***
35-
MicroPython v2.6.0-rc1-416-g3056c5ec30 on 2021-06-24; zephyr-frdm_k64f with mk64f12
34+
*** Booting Zephyr OS build zephyr-v2.7.0 ***
35+
MicroPython v1.17-288-gb695f5a70-dirty on 2022-01-03; 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 v2.6.0, and may also work on higher
7+
This port requires Zephyr version v2.7.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 v2.6.0
42+
$ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.7.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 v2.6.0
48+
$ git checkout v2.7.0
4949
$ west update
5050

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

tools/ci.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@ function ci_windows_build {
605605

606606
ZEPHYR_DOCKER_VERSION=v0.21.0
607607
ZEPHYR_SDK_VERSION=0.13.2
608+
ZEPHYR_VERSION=v2.7.0
608609

609610
function ci_zephyr_setup {
610611
docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
@@ -619,7 +620,7 @@ function ci_zephyr_setup {
619620
}
620621

621622
function ci_zephyr_install {
622-
docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject
623+
docker exec zephyr-ci west init --mr ${ZEPHYR_VERSION} /zephyrproject
623624
docker exec -w /zephyrproject zephyr-ci west update
624625
docker exec -w /zephyrproject zephyr-ci west zephyr-export
625626
}

0 commit comments

Comments
 (0)