zephyrproject-rtos · sylvioalves · Nov 2, 2024 · Nov 2, 2024 · Nov 2, 2024 · Nov 2, 2024
diff --git a/boards/01space/esp32c3_042_oled/esp32c3_042_oled.yaml b/boards/01space/esp32c3_042_oled/esp32c3_042_oled.yaml
@@ -13,6 +13,5 @@ supported:
   - watchdog
 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
@@ -18,6 +18,5 @@ supported:
   - input
 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
@@ -20,6 +20,5 @@ supported:
   - input
 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
@@ -20,6 +20,5 @@ supported:
   - input
 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
@@ -12,6 +12,5 @@ supported:
   - pwm
 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
@@ -17,6 +17,5 @@ supported:
   - entropy
 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
@@ -18,6 +18,5 @@ supported:
   - entropy
 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
@@ -20,6 +20,5 @@ supported:
   - entropy
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml
@@ -14,6 +14,5 @@ supported:
   - entropy
 testing:
   ignore_tags:
-    - net
     - bluetooth
     - tracing
diff --git a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.yaml b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.yaml
@@ -21,6 +21,5 @@ supported:
   - dma
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32s2_saola/esp32s2_saola.yaml b/boards/espressif/esp32s2_saola/esp32s2_saola.yaml
@@ -17,8 +17,4 @@ supported:
   - counter
   - entropy
   - input
-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
@@ -19,6 +19,5 @@ supported:
   - input
 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
@@ -20,6 +20,5 @@ supported:
   - video
 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
@@ -19,6 +19,5 @@ supported:
   - video
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp8684_devkitm/esp8684_devkitm.yaml b/boards/espressif/esp8684_devkitm/esp8684_devkitm.yaml
@@ -14,6 +14,5 @@ supported:
   - spi
 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
@@ -19,6 +19,5 @@ supported:
   - entropy
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: espressif
diff --git a/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.yaml b/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.yaml
@@ -14,6 +14,5 @@ supported:
 testing:
   ignore_tags:
     - heap
-    - net
     - bluetooth
 vendor: franzininho
diff --git a/boards/hardkernel/odroid_go/odroid_go_procpu.yaml b/boards/hardkernel/odroid_go/odroid_go_procpu.yaml
@@ -13,6 +13,5 @@ supported:
   - nvs
 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
@@ -12,6 +12,5 @@ supported:
   - nvs
 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
@@ -18,6 +18,5 @@ supported:
   - lora
 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
@@ -14,6 +14,5 @@ supported:
   - entropy
 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
@@ -17,6 +17,5 @@ supported:
   - sdhc
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: lilygo
diff --git a/boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml b/boards/lilygo/ttgo_t7v1_5/ttgo_t7v1_5_esp32_procpu.yaml
@@ -16,6 +16,5 @@ supported:
   - nvs
 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
@@ -13,6 +13,5 @@ supported:
   - can
 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
@@ -20,6 +20,5 @@ supported:
   - video
 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
@@ -17,6 +17,5 @@ supported:
   - entropy
 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
@@ -17,6 +17,5 @@ supported:
   - entropy
 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
@@ -17,6 +17,5 @@ supported:
   - dma
 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
@@ -17,6 +17,5 @@ supported:
   - dma
 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
@@ -14,6 +14,5 @@ supported:
   - nvs
 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
@@ -16,6 +16,5 @@ supported:
   - display
 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
@@ -18,6 +18,5 @@ supported:
   - dma
 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
@@ -15,6 +15,5 @@ supported:
   - nvs
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: m5stack
diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.yaml b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.yaml
@@ -15,6 +15,5 @@ supported:
   - nvs
 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
@@ -16,6 +16,5 @@ supported:
   - display
 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
@@ -12,6 +12,5 @@ supported:
   - watchdog
 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
@@ -15,6 +15,5 @@ supported:
   - watchdog
 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
@@ -6,6 +6,5 @@ toolchain:
   - zephyr
 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
@@ -13,6 +13,5 @@ supported:
   - can
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: seeed
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6.yaml b/boards/seeed/xiao_esp32c6/xiao_esp32c6.yaml
@@ -13,7 +13,6 @@ supported:
   - entropy
 testing:
   ignore_tags:
-    - net
     - bluetooth
     - tracing
 vendor: seeed
diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.yaml b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.yaml
@@ -17,6 +17,5 @@ supported:
   - dma
 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
@@ -17,6 +17,5 @@ supported:
   - dma
 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
@@ -19,6 +19,5 @@ supported:
   - entropy
 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
@@ -17,6 +17,5 @@ supported:
   - display
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: waveshare
diff --git a/boards/we/orthosie1ev/we_orthosie1ev.yaml b/boards/we/orthosie1ev/we_orthosie1ev.yaml
@@ -18,6 +18,5 @@ supported:
   - entropy
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: we
diff --git a/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml
@@ -10,6 +10,5 @@ supported:
   - uart
 testing:
   ignore_tags:
-    - net
     - bluetooth
 vendor: wemos
diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
@@ -211,9 +211,17 @@ Video
 
 Watchdog
 ========
+Wi-Fi
+=====
+
 
 * Renamed the ``compatible`` from ``nxp,kinetis-wdog32`` to :dtcompatible:`nxp,wdog32`.
 
+* The config options :kconfig:option:`CONFIG_NXP_BUILD_ONLY_NO_BLOBS` and
+  :kconfig:option:`CONFIG_NRF_BUILD_ONLY_NO_BLOBS` are now unified under
+  :kconfig:option:`CONFIG_BUILD_ONLY_NO_BLOBS` making it a common entry point
+  for any vendor to enable builds without blobs.
+
 Bluetooth
 *********
 

diff --git a/drivers/wifi/CMakeLists.txt b/drivers/wifi/CMakeLists.txt
@@ -3,11 +3,23 @@
 zephyr_library()
 zephyr_library_property(ALLOW_EMPTY TRUE)
 
-add_subdirectory_ifdef(CONFIG_WIFI_ESP_AT       esp_at)
-add_subdirectory_ifdef(CONFIG_WIFI_ESP32        esp32)
+if (CONFIG_BUILD_ONLY_NO_BLOBS)
+  message(WARNING "
+  ---------------------------------------------------------------------------
+  Building only the Wi-Fi 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_WIFI_ENABLED)
   zephyr_blobs_verify(MODULE hal_espressif REQUIRED)
 endif()
+
+endif() # CONFIG_BUILD_ONLY_NO_BLOBS
+
+add_subdirectory_ifdef(CONFIG_WIFI_ESP_AT       esp_at)
+add_subdirectory_ifdef(CONFIG_WIFI_ESP32        esp32)
 add_subdirectory_ifdef(CONFIG_WIFI_ESWIFI       eswifi)
 add_subdirectory_ifdef(CONFIG_WIFI_SIMPLELINK   simplelink)
 add_subdirectory_ifdef(CONFIG_WIFI_WINC1500     winc1500)

diff --git a/drivers/wifi/esp32/Kconfig.esp32 b/drivers/wifi/esp32/Kconfig.esp32
@@ -4,7 +4,7 @@ menuconfig WIFI_ESP32
 	bool "ESP32 SoC WiFi support"
 	default y
 	depends on DT_HAS_ESPRESSIF_ESP32_WIFI_ENABLED
-	depends on ZEPHYR_HAL_ESPRESSIF_MODULE_BLOBS
+	depends on ZEPHYR_HAL_ESPRESSIF_MODULE_BLOBS || BUILD_ONLY_NO_BLOBS
 	depends on !SMP
 	select THREAD_CUSTOM_DATA
 	select NET_L2_WIFI_MGMT

diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -75,14 +75,7 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
 
 target_link_libraries(nrf_wifi PRIVATE nrf70-buslib)
 
-if (CONFIG_NRF_WIFI_BUILD_ONLY_MODE)
-  message(WARNING "
-  ------------------------------------------------------------------------
-  Building only the nRF70 driver, skipping firmware patch.
-  This is only for building (CI) purposes and will not work on a real device.
-  ------------------------------------------------------------------------
-  ")
-elseif(CONFIG_NRF_WIFI_PATCHES_BUILTIN)
+if (CONFIG_NRF_WIFI_PATCHES_BUILTIN)
   zephyr_blobs_verify(MODULE nrf_wifi REQUIRED)
   # RPU FW patch binaries based on the selected configuration
   if(CONFIG_NRF70_SYSTEM_MODE)