|
1 | 1 | import asyncio |
2 | | -import colorlog |
3 | | -import sys |
4 | 2 | import logging |
5 | 3 | import os |
6 | 4 | import pathlib |
7 | | -import tomllib |
8 | | -import tomlkit |
9 | | -import yaml |
10 | 5 | import pickle |
| 6 | +import sys |
11 | 7 |
|
12 | | -import cpbuild |
13 | 8 | import board_tools |
| 9 | +import colorlog |
| 10 | +import cpbuild |
| 11 | +import tomlkit |
| 12 | +import tomllib |
| 13 | +import yaml |
14 | 14 |
|
15 | 15 | logger = logging.getLogger(__name__) |
16 | 16 |
|
@@ -219,13 +219,13 @@ async def build_circuitpython(): |
219 | 219 | circuitpython_flags.append(f"-DCIRCUITPY_ENABLE_MPY_NATIVE={1 if enable_mpy_native else 0}") |
220 | 220 | circuitpython_flags.append(f"-DCIRCUITPY_FULL_BUILD={1 if full_build else 0}") |
221 | 221 | 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}\"'") |
223 | 223 | circuitpython_flags.append(f"-DCIRCUITPY_TUSB_MEM_ALIGN={tusb_mem_align}") |
224 | 224 | circuitpython_flags.append(f"-DCIRCUITPY_TRANSLATE_OBJECT={1 if lto else 0}") |
225 | 225 | circuitpython_flags.append("-DINTERNAL_FLASH_FILESYSTEM") |
226 | 226 | circuitpython_flags.append("-DLONGINT_IMPL_MPZ") |
227 | 227 | 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\"'") |
229 | 229 | circuitpython_flags.extend(("-I", srcdir)) |
230 | 230 | circuitpython_flags.extend(("-I", srcdir / "lib/tinyusb/src")) |
231 | 231 | circuitpython_flags.extend(("-I", srcdir / "supervisor/shared/usb")) |
@@ -448,10 +448,7 @@ async def build_circuitpython(): |
448 | 448 |
|
449 | 449 | if "ssl" in enabled_modules: |
450 | 450 | # 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\"'") |
455 | 452 | circuitpython_flags.extend( |
456 | 453 | ("-isystem", portdir / "modules" / "crypto" / "mbedtls" / "include") |
457 | 454 | ) |
|
0 commit comments