From 5cb2ade65b9540dd1abdbfee944bcb9f1f1c52aa Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Thu, 20 May 2021 21:48:10 -0500 Subject: [PATCH] zephyr: Update to Zephyr v2.6.0. Updates the zephyr port build instructions and CI to use the latest zephyr release tag. Signed-off-by: Maureen Helm --- ports/zephyr/README.md | 6 +++--- tools/ci.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md index cdc3c70f0e..9d6c223b47 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.5.0, and may also work on higher +This port requires Zephyr version v2.6.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). @@ -38,13 +38,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.5.0 + $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.6.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.5.0 + $ git checkout v2.6.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 e726ae40a7..96c1bf89af 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -559,7 +559,7 @@ function ci_zephyr_setup { } function ci_zephyr_install { - docker exec zephyr-ci west init --mr v2.5.0 /zephyrproject + docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject docker exec -w /zephyrproject zephyr-ci west update docker exec -w /zephyrproject zephyr-ci west zephyr-export }