Skip to content

Commit ca633e2

Browse files
mergify[bot]dayjabyAcuadros95
authored
bump zephyr version to 2.6.0; zephyr-sdk version to 0.12.4 (backport #351) (#357)
* bump zephyr version to 2.6.0; zephyr-sdk version to 0.12.4 (#351) (cherry picked from commit 535e745) # Conflicts: # README.md * Fix merge conflict Co-authored-by: David Jablonski <dayjaby@gmail.com> Co-authored-by: Antonio cuadros <acuadros1995@gmail.com>
1 parent 872011a commit ca633e2

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ This package is the **official build system for micro-ROS**. It provides tools a
2828
| [FreeRTOS](https://www.freertos.org/) | [ST Nucleo F767ZI](https://www.st.com/en/evaluation-tools/nucleo-f746zg.html) <sup>1</sup> | STM32CubeMX latest | `freertos nucleo_f767zi` |
2929
| [FreeRTOS](https://www.freertos.org/) | [Espressif ESP32](https://www.espressif.com/en/products/socs/esp32/overview) | v8.2.0 | `freertos esp32` |
3030
| [FreeRTOS](https://www.freertos.org/) | [Crazyflie 2.1](https://www.bitcraze.io/crazyflie-2-1/) | v10.2.1 - CF 2020.06 | `freertos crazyflie21` |
31-
| [Zephyr](https://www.zephyrproject.org/) | [Olimex STM32-E407](https://www.olimex.com/Products/ARM/ST/STM32-E407/open-source-hardware) | v2.4.99 | `zephyr olimex-stm32-e407` |
32-
| [Zephyr](https://www.zephyrproject.org/) | [ST B-L475E-IOT01A](https://docs.zephyrproject.org/latest/boards/arm/disco_l475_iot1/doc/index.html) | v2.4.99 | `zephyr discovery_l475_iot1` |
33-
| [Zephyr](https://www.zephyrproject.org/) | [ST Nucleo H743ZI](https://www.st.com/en/evaluation-tools/nucleo-h743zi.html) <sup>1</sup> | v2.4.99 | `zephyr nucleo_h743zi` |
34-
| [Zephyr](https://www.zephyrproject.org/) | [Zephyr emulator](https://docs.zephyrproject.org/2.3.0/boards/posix/native_posix/doc/index.html) | v2.4.99 | `zephyr host` |
31+
| [Zephyr](https://www.zephyrproject.org/) | [Olimex STM32-E407](https://www.olimex.com/Products/ARM/ST/STM32-E407/open-source-hardware) | v2.6.0 | `zephyr olimex-stm32-e407` |
32+
| [Zephyr](https://www.zephyrproject.org/) | [ST B-L475E-IOT01A](https://docs.zephyrproject.org/latest/boards/arm/disco_l475_iot1/doc/index.html) | v2.6.0 | `zephyr discovery_l475_iot1` |
33+
| [Zephyr](https://www.zephyrproject.org/) | [ST Nucleo H743ZI](https://www.st.com/en/evaluation-tools/nucleo-h743zi.html) <sup>1</sup> | v2.6.0 | `zephyr nucleo_h743zi` |
34+
| [Zephyr](https://www.zephyrproject.org/) | [Zephyr emulator](https://docs.zephyrproject.org/2.3.0/boards/posix/native_posix/doc/index.html) | v2.6.0 | `zephyr host` |
3535
| [Mbed](https://os.mbed.com/) | [ST B-L475E-IOT01A](https://os.mbed.com/platforms/ST-Discovery-L475E-IOT01A/) | v6.6 | `mbed disco_l475vg_iot01a` |
3636
| - | Static library (.a) and headers (.h) <sup>3</sup> | - | `generate_lib` |
3737
| Linux | *Host <sup>2</sup>* | Ubuntu 18.04/20.04 | `host` |

config/zephyr/generic/create.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ pushd $FW_TARGETDIR >/dev/null
2121
west init zephyrproject
2222
pushd zephyrproject >/dev/null
2323
cd zephyr
24-
git checkout zephyr-v2.5.0
24+
git checkout zephyr-v2.6.0
2525
cd ..
2626
west update
2727
popd >/dev/null
2828

2929
pip3 install -r zephyrproject/zephyr/scripts/requirements.txt
3030

3131
if [ "$PLATFORM" = "host" ]; then
32-
export TOOLCHAIN_VERSION=zephyr-sdk-0.11.2-setup.run
32+
export TOOLCHAIN_VERSION=zephyr-sdk-0.12.4-x86_64-linux-setup.run
3333
else
34-
export TOOLCHAIN_VERSION=zephyr-toolchain-arm-0.11.2-setup.run
34+
export TOOLCHAIN_VERSION=zephyr-toolchain-arm-0.12.4-x86_64-linux-setup.run
3535
fi
3636

37-
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.11.2/$TOOLCHAIN_VERSION
37+
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.12.4/$TOOLCHAIN_VERSION
3838
chmod +x $TOOLCHAIN_VERSION
3939
./$TOOLCHAIN_VERSION -- -d $(pwd)/zephyr-sdk -y
4040

0 commit comments

Comments
 (0)