Skip to content

Commit 6ab602e

Browse files
committed
Update to Zephyr v4.3.0
1 parent fa4caf8 commit 6ab602e

File tree

6 files changed

+88
-15
lines changed

6 files changed

+88
-15
lines changed

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: 7 additions & 7 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

@@ -448,7 +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\\"')
451+
circuitpython_flags.append('-DMBEDTLS_CONFIG_FILE=\\"config-mbedtls.h\\"')
452452
circuitpython_flags.extend(
453453
("-isystem", portdir / "modules" / "crypto" / "tinycrypt" / "lib" / "include")
454454
)

ports/zephyr-cp/cptools/zephyr2cp.py

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import logging
22
import pathlib
3-
import cpbuild
43

5-
from devicetree import dtlib
4+
import cpbuild
65
import yaml
7-
86
from compat2driver import COMPAT_TO_DRIVER
7+
from devicetree import dtlib
98

109
logger = logging.getLogger(__name__)
1110

@@ -82,13 +81,87 @@
8281
"D12",
8382
"D13",
8483
],
84+
"arducam,dvp-20pin-connector": [
85+
"SCL",
86+
"SDA",
87+
"VS",
88+
"HS",
89+
"PCLK",
90+
"XCLK",
91+
"D7",
92+
"D6",
93+
"D5",
94+
"D4",
95+
"D3",
96+
"D2",
97+
"D1",
98+
"D0",
99+
"PEN",
100+
"PDN",
101+
"GPIO0",
102+
"GPIO1",
103+
],
85104
"renesas,ra-gpio-mipi-header": [
86105
"IIC_SDA",
87106
"DISP_BLEN",
88107
"IIC_SCL",
89108
"DISP_INT",
90109
"DISP_RST",
91110
],
111+
"renesas,ra-parallel-graphics-header": [
112+
"DISP_BLEN",
113+
"IIC_SDA",
114+
"DISP_INT",
115+
"IIC_SCL",
116+
"DISP_RST",
117+
"LCDC_TCON0",
118+
"LCDC_CLK",
119+
"LCDC_TCON2",
120+
"LCDC_TCON1",
121+
"LCDC_EXTCLK",
122+
"LCDC_TCON3",
123+
"LCDC_DATA01",
124+
"LCDC_DATA00",
125+
"LCDC_DATA03",
126+
"LCDC_DATA02",
127+
"LCDC_DATA05",
128+
"LCDC_DATA04",
129+
"LCDC_DATA07",
130+
"LCDC_DATA16",
131+
"LCDC_DATA09",
132+
"LCDC_DATA08",
133+
"LCDC_DATA11",
134+
"LCDC_DATA10",
135+
"LCDC_DATA13",
136+
"LCDC_DATA12",
137+
"LCDC_DATA15",
138+
"LCDC_DATA14",
139+
"LCDC_DATA17",
140+
"LCDC_DATA16",
141+
"LCDC_DATA19",
142+
"LCDC_DATA18",
143+
"LCDC_DATA21",
144+
"LCDC_DATA20",
145+
"LCDC_DATA23",
146+
"LCDC_DATA22",
147+
],
148+
"st,stm32-dcmi-camera-fpu-330zh": [
149+
"SCL",
150+
"SDA",
151+
"RESET",
152+
"PEN",
153+
"VS",
154+
"HS",
155+
"PCLK",
156+
"D7",
157+
"D6",
158+
"D5",
159+
"D4",
160+
"D3",
161+
"D2",
162+
"D1",
163+
"D0",
164+
],
92165
}
93166

94167

ports/zephyr-cp/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
1414
CONFIG_THREAD_STACK_INFO=y
1515
CONFIG_STACK_SENTINEL=y
1616
CONFIG_DEBUG_THREAD_INFO=y
17-
CONFIG_DEBUG_INFO=y
17+
# CONFIG_DEBUG_INFO=y
1818

1919
CONFIG_USB_DEVICE_STACK=n
2020

ports/zephyr-cp/zephyr-config/west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ manifest:
22
projects:
33
- name: zephyr
44
url: https://github.com/adafruit/zephyr
5-
revision: circuitpython
5+
revision: circuitpython-v4.3.0
66
clone-depth: 100
77
import: true

0 commit comments

Comments
 (0)