Rebase Zephyr Env Hub integration onto 11.0.0-alpha.2

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

@@ -43,6 +43,13 @@ runs:
       run: west zephyr-export
       shell: bash
       working-directory: ports/zephyr-cp
+    - name: Fetch cyw43-driver submodule
+      # The CYW43 shared-bus Bluetooth transport needs the georgerobotics
+      # cyw43-driver headers and the BT controller patchram, which live in a
+      # submodule of hal_rpi_pico that west does not check out.
+      run: git -C modules/hal/rpi_pico submodule update --init --depth 1 lib/cyw43-driver
+      shell: bash
+      working-directory: ports/zephyr-cp
     - name: Install Zephyr protobuf dependency
       run: pip install protobuf==6.33.5
       shell: bash

.github/workflows/build-board-custom.yml

@@ -79,6 +79,12 @@ jobs:
         PORT=$(python tools/board_to_port.py "${{ inputs.board }}")
         echo "port=$PORT" >> $GITHUB_OUTPUT
       shell: bash
+    - name: Build extensions
+      id: build-extensions
+      run: |
+        EXT=$(python tools/board_build_extensions.py "${{ inputs.board }}")
+        echo "extensions=$EXT" >> $GITHUB_OUTPUT
+      shell: bash
     - name: Set up port
       id: set-up-port
       uses: ./.github/actions/deps/ports
@@ -121,7 +127,18 @@ jobs:
         BOARD: ${{ inputs.board }}
         FLAGS: ${{ inputs.flags }}
         DEBUG: ${{ inputs.debug && '1' || '0' }}
-      run: make -j$(nproc) $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
+        BUILD: build-${{ inputs.board }}
+        EXTENSIONS: ${{ steps.build-extensions.outputs.extensions }}
+      run: |
+        # Name the firmware.<ext> targets explicitly rather than relying on the
+        # default goal. The zephyr-cp port's default goal is the Zephyr ELF, so
+        # the firmware.* copies the artifact upload expects are never made.
+        ARTIFACTS=""
+        for ext in $EXTENSIONS; do
+          ARTIFACTS="$ARTIFACTS $BUILD/firmware.$ext"
+        done
+        make -j4 $FLAGS BOARD="$BOARD" BUILD="$BUILD" DEBUG=$DEBUG \
+             TRANSLATION="$TRANSLATION" $ARTIFACTS
       working-directory: ports/${{ steps.board-to-port.outputs.port }}
     - name: Upload artifact
       uses: actions/upload-artifact@v7

ports/zephyr-cp/Makefile

@@ -74,10 +74,17 @@ ifneq ($(CP_BOARD_CONSOLE_OVERLAY),)
 CP_BOARD_CONF := $(strip $(CP_BOARD_CONF) $(CURDIR)/console.conf)
 endif
 endif
+# When RTT=1, move the Zephyr console and log backend from UART0 to SEGGER RTT, so
+# printk/LOG_* can be read over the same SWD probe with OpenOCD (`rtt setup`,
+# `rtt start`, `rtt server start <port> 0`) even when USB CDC is down and no UART
+# is wired. Composable with DEBUG=1.
+RTT_CONF_FILE ?= $(CURDIR)/rtt.conf
+ifeq ($(RTT),1)
+CP_BOARD_CONF := $(strip $(CP_BOARD_CONF) $(RTT_CONF_FILE))
+endif
 CP_BOARD_CONF := $(subst $(eval) ,;,$(CP_BOARD_CONF))
-# Always pass the conf and console overlay files, even if empty. This undoes DEBUG=1 or CONSOLE=1
-# when it's omitted on a later run. Quoted because the conf value can be a semicolon-separated
-# list, and an unquoted semicolon would end the shell command.
+# Always pass both values, even if empty, to undo DEBUG/CONSOLE/RTT on a later run.
+# Quote the semicolon-separated configuration list for the shell.
 WEST_CMAKE_ARGS += -Dzephyr-cp_EXTRA_CONF_FILE="$(CP_BOARD_CONF)"
 WEST_CMAKE_ARGS += -Dzephyr-cp_EXTRA_DTC_OVERLAY_FILE="$(CP_BOARD_CONSOLE_OVERLAY)"
 

ports/zephyr-cp/background.c

@@ -9,6 +9,10 @@
 #include "py/runtime.h"
 #include "supervisor/port.h"
 
+#if CIRCUITPY_BLEIO
+#include "common-hal/_bleio/__init__.h"
+#endif
+
 #include <zephyr/kernel.h>
 
 void port_start_background_tick(void) {
@@ -26,4 +30,7 @@ void port_background_task(void) {
     #if defined(CONFIG_ARCH_POSIX)
     k_busy_wait(100);
     #endif
+    #if CIRCUITPY_BLEIO
+    bleio_background();
+    #endif
 }

ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/autogen_board_info.toml

@@ -3,7 +3,7 @@ name = "Raspberry Pi Foundation Raspberry Pi Pico 2 W"
 
 [modules]
 __future__ = true
-_bleio = false
+_bleio = true # Zephyr board has _bleio
 _eve = false
 _pew = false
 _pixelmap = false

ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.conf

@@ -3,6 +3,12 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 
+# TCP. Nothing in the port or the SoC defaults turns it on, so until now every
+# SOCK_STREAM socket on these boards failed inside net_context_get() with
+# EPROTOTYPE -- surfaced by socketpool as "Out of sockets" -- which also means
+# the web workflow's listener never opened. HTTP(S) clients and servers need it.
+CONFIG_NET_TCP=y
+
 CONFIG_WIFI=y
 CONFIG_WIFI_NM_WPA_SUPPLICANT_LEGACY_CRYPTO=n
 CONFIG_NET_L2_WIFI_MGMT=y
@@ -14,3 +20,64 @@ CONFIG_NET_HOSTNAME_DYNAMIC=y
 CONFIG_NET_HOSTNAME="circuitpython"
 
 CONFIG_MBEDTLS=y
+
+# The collector's captive portal serves HTTPS from a PEM certificate chain
+# (fullchain.pem / key.pem via ssl.SSLContext.load_cert_chain); mbedTLS only
+# parses DER unless PEM decoding is compiled in.
+CONFIG_MBEDTLS_PEM_PARSE_C=y
+
+# TLS 1.2 ECDHE. Zephyr's mbedTLS 4 default serves secp256r1 through the p256-m
+# PSA driver and leaves the builtin ECP module out. mbedTLS then defines a dummy
+# MBEDTLS_ECP_MAX_BITS of 1, and ssl.h sizes the TLS 1.2 premaster buffer
+# (union mbedtls_ssl_premaster_secret._pms_ecdh[MBEDTLS_ECP_MAX_BYTES]) from
+# it, so every ECDHE key agreement fails with PSA_ERROR_BUFFER_TOO_SMALL -- a
+# 1-byte buffer for a 32-byte shared secret -- and surfaces as OSError 138 on
+# the first read of any TLS connection, client or server. Keep the builtin
+# ECP module (p256-m off) until the header sizes that buffer from PSA.
+CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED=n
+
+# SoftAP. wifi.radio.start_ap() drives the AIROC driver's ap_enable through
+# wifi_mgmt (the driver already implements it; this only enables the pieces
+# around it). The DHCPv4 server hands joining stations addresses from a pool
+# just above the AP's own -- 192.168.4.1 by default, as on ESP32 -- and tells
+# them the AP is their DNS server and (RFC 8910 option 114) captive portal, so
+# a portal served from CircuitPython is found by phones and laptops without
+# the user typing an address.
+CONFIG_NET_DHCPV4_SERVER=y
+CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT=8
+CONFIG_NET_DHCPV4_SERVER_OPTION_DNS_ADDRESS="192.168.4.1"
+CONFIG_NET_DHCPV4_SERVER_OPTION_CAPTIVE_PORTAL=y
+
+# Bluetooth over the shared gSPI bus (CONFIG_BT itself comes from the
+# zephyr,bt-hci chosen node in the overlay).
+#
+# The WHD WiFi, cybt BT and coexistence call chains are deeper than the
+# defaults in ../prj.conf; the Cortex-M33 MPU catches an overflow cleanly
+# instead of silently corrupting neighbouring stacks.
+CONFIG_HW_STACK_PROTECTION=y
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+
+# The CYW43439's BT controller firmware (CYW4343A2_001.003.016.0065.0000) does
+# not implement the Bluetooth 5 extended advertising/scanning commands: it
+# rejects LE Set Extended Scan Parameters (0x2041) with status 0x01 "Unknown
+# HCI Command", so scanning fails with -EIO. The port defaults BT_EXT_ADV on,
+# so turn it off here to make the host use the legacy 0x200B/0x200C scan and
+# legacy advertising commands instead.
+CONFIG_BT_EXT_ADV=n
+
+# Sockets. Every Zephyr socket -- a listener, each accepted client, each UDP
+# socket -- takes one net_context, and the default pool is 6. A CircuitPython
+# program serving HTTP over the station link to a browser that opens several
+# connections per page, with NTP and a captive/mDNS UDP socket beside it, sits
+# at that ceiling, and the 6th socket() or accept() fails with ENOMEM. A
+# net_context is ~150 bytes; the RP2350 has the RAM, so double the pool and
+# the connection-handler table that goes with it (NET_MAX_CONN, default 8).
+CONFIG_NET_MAX_CONTEXTS=12
+CONFIG_NET_MAX_CONN=16
+
+# File descriptors. Zephyr sizes the fd table from the subsystems' declared
+# needs (ZVFS_OPEN_ADD_SIZE_*), which came to 4 here; the DHCPv4 server takes
+# one socket plus the socket-service eventfd, leaving a program two, and
+# socketpool.socket() then fails with "Out of sockets" at the first TLS
+# listener. Give sockets a real ceiling (each fd entry is ~12 bytes).
+CONFIG_ZVFS_OPEN_MAX=16

ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay

@@ -1,3 +1,57 @@
 /* Partition layout is owned by the mcuboot fork (dts/raspberrypi/rpi_pico2.dtsi)
  * and applied to this image by sysbuild. This overlay only adds board/app config. */
+
+/*
+ * Settings partition: one exception to the layout above. sysbuild prepends the
+ * adaboot layout (dts/raspberrypi/rpi_pico2_w.dtsi) to this overlay, so what
+ * is set here wins.
+ *
+ * The settings partition backs Bluetooth bond keys via NVS, so it must be
+ * erase-sector aligned and hold at least two of the RP2350's 4K sectors.
+ * The layout gives it one (0x17f000, 4K); nvs_mount() rejects a single sector
+ * with -EINVAL, which makes bt_enable() fail before ever opening the HCI
+ * driver and surfaces as a bare OSError from "import _bleio".
+ *
+ * nvm and the filesystem must stay where ports/raspberrypi puts them
+ * (cptools/check_partitions.py enforces this), so the second sector comes out
+ * of the code partition, not out of the CIRCUITPY drive.
+ */
+&code_partition {
+	reg = <0x0 0x17e000>;
+};
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	partitions {
+		storage_partition: partition@17e000 {
+			compatible = "zephyr,mapped-partition";
+			label = "storage";
+			reg = <0x17e000 0x2000>;
+		};
+	};
+};
+
+/*
+ * Bluetooth. The CYW43439's HCI is not on a UART here — it shares the WiFi
+ * gSPI bus — so hang the shared-bus HCI transport off the board's stock
+ * infineon,airoc-wifi node and point the host at it. CONFIG_BT then turns
+ * itself on via the zephyr,bt-hci chosen (see
+ * ../../../internal-modules/circuitpython-kconfig/Kconfig).
+ */
+&pio0_spi0 {
+	airoc-wifi@0 {
+		cyw43_bt_hci: cyw43_bt_hci {
+			compatible = "infineon,cyw43-bt-hci";
+			status = "okay";
+		};
+	};
+};
+
+/ {
+	chosen {
+		zephyr,bt-hci = &cyw43_bt_hci;
+	};
+};
+
 #include "../../../app.overlay"

ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/autogen_board_info.toml

@@ -3,7 +3,7 @@ name = "Raspberry Pi Foundation Raspberry Pi Pico W"
 
 [modules]
 __future__ = true
-_bleio = false
+_bleio = true # Zephyr board has _bleio
 _eve = false
 _pew = false
 _pixelmap = false

ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.conf

@@ -3,6 +3,12 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
 
+# TCP. Nothing in the port or the SoC defaults turns it on, so until now every
+# SOCK_STREAM socket on these boards failed inside net_context_get() with
+# EPROTOTYPE -- surfaced by socketpool as "Out of sockets" -- which also means
+# the web workflow's listener never opened. HTTP(S) clients and servers need it.
+CONFIG_NET_TCP=y
+
 CONFIG_WIFI=y
 CONFIG_WIFI_NM_WPA_SUPPLICANT_LEGACY_CRYPTO=n
 CONFIG_NET_L2_WIFI_MGMT=y
@@ -15,4 +21,88 @@ CONFIG_NET_HOSTNAME="circuitpython"
 
 CONFIG_MBEDTLS=y
 
+# The collector's captive portal serves HTTPS from a PEM certificate chain
+# (fullchain.pem / key.pem via ssl.SSLContext.load_cert_chain); mbedTLS only
+# parses DER unless PEM decoding is compiled in.
+CONFIG_MBEDTLS_PEM_PARSE_C=y
+
+# TLS 1.2 ECDHE. Zephyr's mbedTLS 4 default serves secp256r1 through the p256-m
+# PSA driver and leaves the builtin ECP module out. mbedTLS then defines a dummy
+# MBEDTLS_ECP_MAX_BITS of 1, and ssl.h sizes the TLS 1.2 premaster buffer
+# (union mbedtls_ssl_premaster_secret._pms_ecdh[MBEDTLS_ECP_MAX_BYTES]) from
+# it, so every ECDHE key agreement fails with PSA_ERROR_BUFFER_TOO_SMALL -- a
+# 1-byte buffer for a 32-byte shared secret -- and surfaces as OSError 138 on
+# the first read of any TLS connection, client or server. Keep the builtin
+# ECP module (p256-m off) until the header sizes that buffer from PSA.
+CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED=n
+
+# File descriptors. Zephyr sizes the fd table from the subsystems' declared
+# needs (ZVFS_OPEN_ADD_SIZE_*), which came to 4 here; the DHCPv4 server takes
+# one socket plus the socket-service eventfd, leaving a program two, and
+# socketpool.socket() then fails with "Out of sockets" at the first TLS
+# listener. Give sockets a real ceiling (each fd entry is ~12 bytes).
+CONFIG_ZVFS_OPEN_MAX=16
+
+# SoftAP. wifi.radio.start_ap() drives the AIROC driver's ap_enable through
+# wifi_mgmt (the driver already implements it; this only enables the pieces
+# around it). The DHCPv4 server hands joining stations addresses from a pool
+# just above the AP's own -- 192.168.4.1 by default, as on ESP32 -- and tells
+# them the AP is their DNS server and (RFC 8910 option 114) captive portal, so
+# a portal served from CircuitPython is found by phones and laptops without
+# the user typing an address.
+CONFIG_NET_DHCPV4_SERVER=y
+CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT=8
+CONFIG_NET_DHCPV4_SERVER_OPTION_DNS_ADDRESS="192.168.4.1"
+CONFIG_NET_DHCPV4_SERVER_OPTION_CAPTIVE_PORTAL=y
+
 CONFIG_TEST_RANDOM_GENERATOR=y
+
+# Bluetooth over the shared gSPI bus (CONFIG_BT itself comes from the
+# zephyr,bt-hci chosen node in the overlay).
+#
+# The CYW43439's BT controller firmware does not implement the Bluetooth 5
+# extended advertising/scanning commands, and the port defaults BT_EXT_ADV on,
+# so turn it off here and let the host use the legacy 0x200B/0x200C commands.
+CONFIG_BT_EXT_ADV=n
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+
+# The RP2040 has 264 KB RAM. Five reserved BLE connections plus WiFi/TLS
+# overflow RAM with alpha.2; two cover the workflow and one application peer.
+CONFIG_BT_MAX_CONN=2
+
+# Keep the WiFi + BLE integration within RP2040 RAM. The portal uses IPv4;
+# six contexts cover DHCP/DNS, a listener, an accepted client and spare
+# outbound sockets. Pico 2 W keeps the larger dual-stack configuration.
+CONFIG_NET_IPV6=n
+CONFIG_NET_MAX_CONTEXTS=6
+CONFIG_NET_MAX_CONN=6
+
+# Leave runtime RAM for the Python heap and USB CDC buffers. Merely linking
+# the dual-radio image can consume all SRAM and silently disable USB CDC.
+# Keep full-sized WHD packets and the six-buffer coexistence reserve; reduce
+# burst capacity only on the 264 KB RP2040 (Pico 2 W retains the defaults).
+CONFIG_AIROC_WIFI_TX_PACKET_POOL_COUNT=4
+CONFIG_AIROC_WIFI_RX_PACKET_POOL_COUNT=4
+# A verified RSA TLS handshake alongside BLE used 3,536 bytes of this stack.
+# Keep an 8 KiB reservation with overflow detection and high-water evidence;
+# the former 16 KiB reservation left too little heap for that handshake.
+CONFIG_MAIN_STACK_SIZE=8192
+
+# Keep space for TLS's 16 KB inbound / 8 KB outbound records and handshake.
+# IPv4 packets remain full-sized through chained 128-byte buffers; the smaller
+# pools limit concurrent bursts rather than the accepted network MTU.
+CONFIG_NET_PKT_RX_COUNT=8
+CONFIG_NET_PKT_TX_COUNT=8
+CONFIG_NET_BUF_RX_COUNT=24
+CONFIG_NET_BUF_TX_COUNT=24
+
+# Retain stack/allocator measurements for on-device RAM validation.
+CONFIG_INIT_STACKS=y
+CONFIG_STACK_SENTINEL=y
+CONFIG_SYS_HEAP_RUNTIME_STATS=y
+
+# A second 4 KiB USB mass-storage transfer buffer leaves insufficient native
+# heap for a verified RSA handshake with the full-chain TLS record sizes.
+# Keep mass storage and its full transfer size; trade pipelined throughput
+# for RAM on RP2040. Pico 2 W retains double buffering.
+CONFIG_USBD_MSC_DOUBLE_BUFFERING=n