Skip to content

Commit 70a3af8

Browse files
committed
Update to Zephyr v4.3.0
1 parent f6f52ad commit 70a3af8

File tree

10 files changed

+838
-125
lines changed

10 files changed

+838
-125
lines changed

.github/actions/deps/ports/zephyr-cp/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ name: Fetch Zephyr port deps
33
runs:
44
using: composite
55
steps:
6+
- name: Get libusb
7+
if: runner.os == 'Linux'
8+
run: |
9+
sudo apt-get update
10+
sudo apt-get install -y libusb-1.0-0-dev libudev-dev
11+
shell: bash
612
- name: Setup Zephyr project
713
uses: zephyrproject-rtos/action-zephyr-setup@v1
814
with:

ports/zephyr-cp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ pip install west
1515
west init -l zephyr-config
1616
west update
1717
west zephyr-export
18-
pip install -r lib/zephyr/scripts/requirements.txt
18+
pip install -r zephyr/scripts/requirements.txt
1919
west sdk install
2020
```
2121

22-
Now to build from the top level:
22+
Now to build from `ports/zephyr-cp`:
2323

2424
```sh
2525
make BOARD=nordic_nrf7002dk

ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CONFIG_NETWORKING=y
22
CONFIG_WIFI=y
33

4-
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
4+
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
55
CONFIG_MBEDTLS_USE_PSA_CRYPTO=n
66

77
CONFIG_BT=y

ports/zephyr-cp/cptools/build_circuitpython.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import asyncio
2-
import colorlog
3-
import sys
42
import logging
53
import os
64
import pathlib
7-
import tomllib
8-
import tomlkit
9-
import yaml
105
import pickle
6+
import sys
117

12-
import cpbuild
138
import board_tools
9+
import colorlog
10+
import cpbuild
11+
import tomlkit
12+
import tomllib
13+
import yaml
1414

1515
logger = logging.getLogger(__name__)
1616

@@ -219,13 +219,13 @@ async def build_circuitpython():
219219
circuitpython_flags.append(f"-DCIRCUITPY_ENABLE_MPY_NATIVE={1 if enable_mpy_native else 0}")
220220
circuitpython_flags.append(f"-DCIRCUITPY_FULL_BUILD={1 if full_build else 0}")
221221
circuitpython_flags.append(f"-DCIRCUITPY_USB_HOST={1 if usb_host else 0}")
222-
circuitpython_flags.append(f'-DCIRCUITPY_BOARD_ID=\\"{board}\\"')
222+
circuitpython_flags.append(f"-DCIRCUITPY_BOARD_ID='\"{board}\"'")
223223
circuitpython_flags.append(f"-DCIRCUITPY_TUSB_MEM_ALIGN={tusb_mem_align}")
224224
circuitpython_flags.append(f"-DCIRCUITPY_TRANSLATE_OBJECT={1 if lto else 0}")
225225
circuitpython_flags.append("-DINTERNAL_FLASH_FILESYSTEM")
226226
circuitpython_flags.append("-DLONGINT_IMPL_MPZ")
227227
circuitpython_flags.append("-DCIRCUITPY_SSL_MBEDTLS")
228-
circuitpython_flags.append('-DFFCONF_H=\\"lib/oofatfs/ffconf.h\\"')
228+
circuitpython_flags.append("-DFFCONF_H='\"lib/oofatfs/ffconf.h\"'")
229229
circuitpython_flags.extend(("-I", srcdir))
230230
circuitpython_flags.extend(("-I", srcdir / "lib/tinyusb/src"))
231231
circuitpython_flags.extend(("-I", srcdir / "supervisor/shared/usb"))
@@ -448,10 +448,7 @@ async def build_circuitpython():
448448

449449
if "ssl" in enabled_modules:
450450
# TODO: Figure out how to get these paths from zephyr
451-
circuitpython_flags.append('-DMBEDTLS_CONFIG_FILE=\\"config-tls-generic.h\\"')
452-
circuitpython_flags.extend(
453-
("-isystem", portdir / "modules" / "crypto" / "tinycrypt" / "lib" / "include")
454-
)
451+
circuitpython_flags.append("-DMBEDTLS_CONFIG_FILE='\"config-mbedtls.h\"'")
455452
circuitpython_flags.extend(
456453
("-isystem", portdir / "modules" / "crypto" / "mbedtls" / "include")
457454
)

0 commit comments

Comments
 (0)