zephyr-cp: rebase zephyr pin to zephyr_260803 (CI verification)

ports/zephyr-cp/background.c

@@ -11,6 +11,10 @@
 
 #include <zephyr/kernel.h>
 
+#if CIRCUITPY_BLEIO
+#include "common-hal/_bleio/Adapter.h"
+#endif
+
 void port_start_background_tick(void) {
 }
 
@@ -22,6 +26,13 @@ void port_background_tick(void) {
 }
 
 void port_background_task(void) {
+    #if CIRCUITPY_BLEIO
+    // Resume advertising after a disconnect.  Deferred to here because the
+    // Zephyr disconnect callback runs in the BT thread, where bt_le_adv_start()
+    // must not be called.
+    bleio_background();
+    #endif
+
     // Make sure time advances in the simulator.
     #if defined(CONFIG_ARCH_POSIX)
     k_busy_wait(100);

ports/zephyr-cp/boards/adafruit_feather_nrf52840_nrf52840_sense_uf2.conf

@@ -2,6 +2,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf

@@ -2,6 +2,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/board_aliases.cmake

@@ -51,3 +51,4 @@ cp_board_alias(raspberrypi_rpi_pico_w_zephyr rpi_pico/rp2040/w)
 cp_board_alias(raspberrypi_rpi_pico2_zephyr rpi_pico2/rp2350a/m33)
 cp_board_alias(raspberrypi_rpi_pico2_w_zephyr rpi_pico2/rp2350a/m33/w)
 cp_board_alias(st_nucleo_n657x0_q nucleo_n657x0_q/stm32n657xx)
+cp_board_alias(silabs_siwx917_dk2605a siwx917_dk2605a)

ports/zephyr-cp/boards/da14695_dk_usb.conf

@@ -2,6 +2,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/frdm_rw612.conf

@@ -22,6 +22,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml

@@ -18,8 +18,10 @@ atexit = false
 audiobusio = true # Zephyr board has audiobusio
 audiocore = true # Zephyr board has audiobusio
 audiodelays = true # Zephyr board has audiobusio
+audiofilewriter = false
 audiofilters = true # Zephyr board has audiobusio
 audiofreeverb = true # Zephyr board has audiobusio
+audioi2sin = false
 audioio = false
 audiomixer = true # Zephyr board has audiobusio
 audiomp3 = true # Zephyr board has audiobusio
@@ -105,6 +107,7 @@ touchio = false
 traceback = true
 uheap = false
 usb = false
+usb_audio = false
 usb_cdc = true
 usb_hid = false
 usb_host = false

ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml

@@ -18,8 +18,10 @@ atexit = false
 audiobusio = false
 audiocore = false
 audiodelays = false
+audiofilewriter = false
 audiofilters = false
 audiofreeverb = false
+audioi2sin = false
 audioio = false
 audiomixer = false
 audiomp3 = false
@@ -105,6 +107,7 @@ touchio = false
 traceback = true
 uheap = false
 usb = false
+usb_audio = false
 usb_cdc = true
 usb_hid = false
 usb_host = false

ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf

@@ -11,6 +11,13 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
 
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
+
 CONFIG_BT_L2CAP_TX_MTU=253
 CONFIG_BT_BUF_CMD_TX_COUNT=2
 CONFIG_BT_BUF_CMD_TX_SIZE=255

ports/zephyr-cp/boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -2,6 +2,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.conf

@@ -11,6 +11,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/renesas_da14695_dk_usb.conf

@@ -2,6 +2,13 @@ CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_BROADCASTER=y
+
+# common-hal/_bleio/Service.c registers GATT services built at runtime from
+# Python, so it calls bt_gatt_service_register()/_unregister(). Those are only
+# compiled into the host when BT_GATT_DYNAMIC_DB is set; without it the link
+# fails with "undefined reference to bt_gatt_service_register". Every board
+# that enables BT needs this as long as the port ships a GATT server.
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 

ports/zephyr-cp/boards/silabs/siwx917_dk2605a/autogen_board_info.toml

@@ -0,0 +1,123 @@
+# This file is autogenerated when a board is built. Do not edit. Do commit it to git. Other scripts use its info.
+name = "Silicon Labs SiWx917 Wi-Fi 6 and Bluetooth LE SoC Dev Kit (BRD2605A)"
+
+[modules]
+__future__ = true
+_bleio = true # Zephyr board has _bleio
+_eve = false
+_pew = false
+_pixelmap = false
+_stage = false
+adafruit_bus_device = true
+adafruit_pixelbuf = false
+aesio = true
+alarm = false
+analogbufio = false
+analogio = false
+atexit = false
+audiobusio = false
+audiocore = false
+audiodelays = false
+audiofilewriter = false
+audiofilters = false
+audiofreeverb = false
+audioi2sin = false
+audioio = false
+audiomixer = false
+audiomp3 = false
+audiopwmio = false
+audiospeed = false
+aurora_epaper = false
+bitbangio = false
+bitmapfilter = true # Zephyr board has busio
+bitmaptools = true # Zephyr board has busio
+bitops = false
+board = false
+busdisplay = true # Zephyr board has busio
+busio = true # Zephyr board has busio
+camera = false
+canio = false
+codeop = false
+countio = false
+digitalio = true
+displayio = true # Zephyr board has busio
+dotclockframebuffer = false
+dualbank = false
+epaperdisplay = true # Zephyr board has busio
+floppyio = false
+fontio = true # Zephyr board has busio
+fourwire = true # Zephyr board has busio
+framebufferio = true # Zephyr board has busio
+frequencyio = false
+getpass = true
+gifio = true # Zephyr board has busio
+gnss = false
+hashlib = true # Zephyr networking enabled
+hostnetwork = false
+i2cdisplaybus = true # Zephyr board has busio
+i2cioexpander = false
+i2ctarget = false
+imagecapture = false
+ipaddress = true # Zephyr networking enabled
+is31fl3741 = false
+jpegio = true # Zephyr board has busio
+keypad = false
+keypad_demux = false
+locale = false
+lvfontio = true # Zephyr board has busio
+math = true
+max3421e = false
+mcp4822 = false
+mdns = true # Zephyr board has mdns
+memorymap = false
+memorymonitor = false
+microcontroller = true
+mipidsi = false
+msgpack = true
+neopixel_write = false
+nvm = false
+onewireio = false
+os = true
+paralleldisplaybus = false
+ps2io = false
+pulseio = false
+pwmio = false
+qrio = false
+qspibus = false
+rainbowio = true
+random = true
+rclcpy = false
+rgbmatrix = false
+rotaryio = true # Zephyr board has rotaryio
+rtc = false
+sdcardio = true # Zephyr board has busio
+sdioio = false
+sharpdisplay = true # Zephyr board has busio
+socketpool = true # Zephyr networking enabled
+spitarget = false
+ssl = true # Zephyr networking enabled
+storage = true
+struct = true
+supervisor = true
+synthio = false
+terminalio = true # Zephyr board has busio
+tilepalettemapper = true # Zephyr board has busio
+time = true
+touchio = false
+traceback = true
+uheap = false
+usb = false
+usb_audio = false
+usb_cdc = false
+usb_hid = false
+usb_host = false
+usb_midi = false
+usb_video = false
+ustack = false
+vectorio = true # Zephyr board has busio
+warnings = true
+watchdog = false
+wifi = true # Zephyr board has wifi
+zephyr_display = false
+zephyr_kernel = false
+zlib = true

ports/zephyr-cp/boards/silabs/siwx917_dk2605a/circuitpython.toml

@@ -0,0 +1,2 @@
+CIRCUITPY_BUILD_EXTENSIONS = ["elf", "hex"]
+CIRCUITPY_ULAB = true