zephyrproject-rtos · sylvioalves · Nov 3, 2024 · Nov 27, 2024 · Nov 27, 2024
diff --git a/boards/01space/esp32c3_042_oled/esp32c3_042_oled.yaml b/boards/01space/esp32c3_042_oled/esp32c3_042_oled.yaml
@@ -14,5 +14,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: 01space
diff --git a/boards/dptechnics/walter/walter_esp32s3_procpu.yaml b/boards/dptechnics/walter/walter_esp32s3_procpu.yaml
@@ -19,5 +19,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: dptechnics
diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml
@@ -21,5 +21,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml
@@ -21,5 +21,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml
@@ -13,5 +13,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.yaml b/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.yaml b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.yaml
@@ -19,5 +19,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32c3_rust/esp32c3_rust.yaml b/boards/espressif/esp32c3_rust/esp32c3_rust.yaml
@@ -21,5 +21,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.yaml b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.yaml
@@ -20,5 +20,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.yaml b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.yaml
@@ -21,5 +21,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32s3_eye/esp32s3_eye_procpu.yaml b/boards/espressif/esp32s3_eye/esp32s3_eye_procpu.yaml
@@ -20,5 +20,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.yaml b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.yaml
@@ -20,5 +20,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/hardkernel/odroid_go/odroid_go_procpu.yaml b/boards/hardkernel/odroid_go/odroid_go_procpu.yaml
@@ -14,5 +14,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: hardkernel
diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.yaml b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.yaml
@@ -13,5 +13,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.yaml b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.yaml
@@ -19,5 +19,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: heltec
diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu.yaml b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu.yaml
@@ -15,5 +15,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: kincony
diff --git a/boards/lilygo/ttgo_lora32/ttgo_lora32_esp32_procpu.yaml b/boards/lilygo/ttgo_lora32/ttgo_lora32_esp32_procpu.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: lilygo
diff --git a/boards/lilygo/ttgo_t8c3/ttgo_t8c3.yaml b/boards/lilygo/ttgo_t8c3/ttgo_t8c3.yaml
@@ -14,5 +14,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: lilygo
diff --git a/boards/lilygo/ttgo_t8s3/ttgo_t8s3_procpu.yaml b/boards/lilygo/ttgo_t8s3/ttgo_t8s3_procpu.yaml
@@ -21,5 +21,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: lilygo
diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.yaml b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: luatos
diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.yaml b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: luatos
diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu.yaml b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: luatos
diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb.yaml b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: luatos
diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.yaml b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.yaml
@@ -15,5 +15,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.yaml b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.yaml
@@ -17,5 +17,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.yaml b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.yaml
@@ -19,5 +19,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_procpu.yaml b/boards/m5stack/m5stack_core2/m5stack_core2_procpu.yaml
@@ -16,5 +16,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/m5stack_cores3/m5stack_cores3_procpu.yaml b/boards/m5stack/m5stack_cores3/m5stack_cores3_procpu.yaml
@@ -12,7 +12,6 @@ supported:
   - watchdog
 testing:
   ignore_tags:
-    - bluetooth
     - gpio
     - net
     - pinmux

diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.yaml b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.yaml
@@ -16,5 +16,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.yaml b/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.yaml
@@ -17,5 +17,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/stamp_c3/stamp_c3.yaml b/boards/m5stack/stamp_c3/stamp_c3.yaml
@@ -13,5 +13,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: m5stack
diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.yaml b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.yaml
@@ -16,5 +16,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: olimex
diff --git a/boards/others/icev_wireless/icev_wireless.yaml b/boards/others/icev_wireless/icev_wireless.yaml
@@ -7,5 +7,4 @@ toolchain:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: espressif
diff --git a/boards/seeed/xiao_esp32c3/xiao_esp32c3.yaml b/boards/seeed/xiao_esp32c3/xiao_esp32c3.yaml
@@ -14,5 +14,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: seeed
diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.yaml b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: seeed
diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_sense.yaml b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_sense.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: seeed
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.yaml b/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.yaml
@@ -20,5 +20,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: vcc-gnd
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.yaml b/boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.yaml
@@ -18,5 +18,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: waveshare
diff --git a/boards/we/orthosie1ev/we_orthosie1ev.yaml b/boards/we/orthosie1ev/we_orthosie1ev.yaml
@@ -19,5 +19,4 @@ supported:
 testing:
   ignore_tags:
     - net
-    - bluetooth
 vendor: we
diff --git a/drivers/bluetooth/hci/CMakeLists.txt b/drivers/bluetooth/hci/CMakeLists.txt
@@ -1,32 +1,46 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library_sources_ifdef(CONFIG_BT_ESP32       hci_esp32.c)
+if (CONFIG_BT_BUILD_ONLY_MODE)
+  message(WARNING "
+  ---------------------------------------------------------------------------
+  Building only the Bluetooth driver without binary blobs and patches.
+  This is only for building (CI) purposes and will not work on a real device.
+  ---------------------------------------------------------------------------
+  ")
+else()
+
 if(CONFIG_DT_HAS_ESPRESSIF_ESP32_BT_HCI_ENABLED)
   zephyr_blobs_verify(MODULE hal_espressif REQUIRED)
 endif()
+
+if((CONFIG_DT_HAS_ST_HCI_STM32WBA_ENABLED) OR (CONFIG_DT_HAS_ST_HCI_STM32WB0_ENABLED))
+  zephyr_blobs_verify(MODULE hal_stm32 REQUIRED)
+endif()
+
+if(CONFIG_DT_HAS_SILABS_BT_HCI_EFR32_ENABLED)
+  zephyr_blobs_verify(MODULE hal_silabs REQUIRED)
+endif()
+
+if(CONFIG_DT_HAS_INFINEON_CAT1_BLESS_HCI_ENABLED)
+  zephyr_blobs_verify(MODULE hal_infineon REQUIRED)
+endif()
+
+endif() # CONFIG_BT_BUILD_ONLY_MODE
+
+zephyr_library_sources_ifdef(CONFIG_BT_ESP32       hci_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_BT_H4          h4.c)
 zephyr_library_sources_ifdef(CONFIG_BT_H5          h5.c)
 zephyr_library_sources_ifdef(CONFIG_BT_HCI_IPC     ipc.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SPI_ZEPHYR  spi.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SPI_BLUENRG hci_spi_st.c)
 zephyr_library_sources_ifdef(CONFIG_BT_CYW43XX   h4_ifx_cyw43xxx.c)
 zephyr_library_sources_ifdef(CONFIG_BT_CYW208XX  hci_ifx_cyw208xx.c)
-
 zephyr_library_sources_ifdef(CONFIG_BT_STM32_IPM   ipm_stm32wb.c)
 zephyr_library_sources_ifdef(CONFIG_BT_STM32WBA    hci_stm32wba.c)
 zephyr_library_sources_ifdef(CONFIG_BT_STM32WB0    hci_stm32wb0.c)
-if((CONFIG_DT_HAS_ST_HCI_STM32WBA_ENABLED) OR (CONFIG_DT_HAS_ST_HCI_STM32WB0_ENABLED))
-  zephyr_blobs_verify(MODULE hal_stm32 REQUIRED)
-endif()
 zephyr_library_sources_ifdef(CONFIG_BT_USERCHAN    userchan.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SILABS_EFR32 hci_silabs_efr32.c)
-if(CONFIG_DT_HAS_SILABS_BT_HCI_EFR32_ENABLED)
-  zephyr_blobs_verify(MODULE hal_silabs REQUIRED)
-endif()
 zephyr_library_sources_ifdef(CONFIG_BT_PSOC6_BLESS hci_ifx_psoc6_bless.c)
-if(CONFIG_DT_HAS_INFINEON_CAT1_BLESS_HCI_ENABLED)
-  zephyr_blobs_verify(MODULE hal_infineon REQUIRED)
-endif()
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUAPP nrf53_support.c)
 zephyr_library_sources_ifdef(CONFIG_BT_AMBIQ_HCI   hci_ambiq.c apollox_blue.c)
 zephyr_library_sources_ifdef(CONFIG_BT_DA1469X     hci_da1469x.c)

diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
@@ -64,6 +64,13 @@ config BT_SPI_ZEPHYR
 	  Bluetooth HCI over SPI driver for communication with Bluetooth
 	  controllers running Zephyr.
 
+config BT_BUILD_ONLY_MODE
+	bool "Build only mode (do not link bluetooth firmware blob)"
+	help
+	  Skip linking the firmware blob into the Bluetooth build. This will
+	  not result in a functional application, but allows the Bluetooth
+	  driver to be built without binary blobs.
+
 config BT_SPI_BLUENRG
 	bool
 	default y
@@ -146,7 +153,7 @@ config BT_ESP32
 	bool
 	default y
 	depends on DT_HAS_ESPRESSIF_ESP32_BT_HCI_ENABLED
-	depends on ZEPHYR_HAL_ESPRESSIF_MODULE_BLOBS
+	depends on ZEPHYR_HAL_ESPRESSIF_MODULE_BLOBS || BT_BUILD_ONLY_MODE
 	help
 	  Espressif HCI bluetooth interface
 

diff --git a/samples/bluetooth/central/sample.yaml b/samples/bluetooth/central/sample.yaml
@@ -9,3 +9,10 @@ tests:
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
+  sample.bluetooth.central.esp32:
+    extra_args:
+      - CONFIG_BT_BUILD_ONLY_MODE=y
+    platform_allow:
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32s3_devkitm/esp32s3/procpu
+      - esp32c3_devkitm
diff --git a/samples/bluetooth/peripheral/sample.yaml b/samples/bluetooth/peripheral/sample.yaml
@@ -19,3 +19,10 @@ tests:
     extra_args: SHIELD=x_nucleo_idb05a1
     integration_platforms:
       - nucleo_l4r5zi
+  sample.bluetooth.periodic_adv.esp32:
+    extra_args:
+      - CONFIG_BT_BUILD_ONLY_MODE=y
+    platform_allow:
+      - esp32_devkitc_wroom/esp32/procpu
+      - esp32s3_devkitm/esp32s3/procpu
+      - esp32c3_devkitm
diff --git a/west.yml b/west.yml
@@ -157,7 +157,7 @@ manifest:
       groups:
         - hal
     - name: hal_espressif
-      revision: 980d61c1d3d3e801ed7c5ccb57ec84c5dd9e9360
+      revision: pull/359/head
       path: modules/hal/espressif
       west-commands: west/west-commands.yml
       groups: