xtensa/esp32s3: use common Espressif wireless source

Update the wireless symbols from ESP32S3_* to ESPRESSIF_* for using common layer.
Remove ESP32S3 specific WiFi files and edit build system to use common layer.

arch/xtensa/src/common/espressif/Kconfig

@@ -513,7 +513,10 @@ config ESPRESSIF_WIRELESS
 	select ESP32S2_RNG if ARCH_CHIP_ESP32S2
 	select ESP32S2_RT_TIMER if ARCH_CHIP_ESP32S2
 	select ESP32S2_TIMER0 if ARCH_CHIP_ESP32S2
-	depends on ARCH_CHIP_ESP32S2
+	select ESP32S3_RNG if ARCH_CHIP_ESP32S3
+	select ESP32S3_RT_TIMER if ARCH_CHIP_ESP32S3
+	select ESP32S3_TIMER0 if ARCH_CHIP_ESP32S3
+	depends on ARCH_CHIP_ESP32S2 || ARCH_CHIP_ESP32S3
 	---help---
 		Enable Wireless support
 
@@ -524,6 +527,32 @@ config ESPRESSIF_WIFI
 	---help---
 		Enable Wi-Fi support
 
+config ESPRESSIF_BLE
+	bool "BLE"
+	depends on ARCH_CHIP_ESP32S3
+	default n
+	select ESPRESSIF_WIRELESS
+	---help---
+		Enable BLE support.
+
+config ESP_COEX_SW_COEXIST_ENABLE
+	bool "Software WiFi/Bluetooth/IEEE 802.15.4 coexistence"
+	depends on (ESPRESSIF_WIFI && ESPRESSIF_BLE)
+	default y
+	---help---
+		If enabled, WiFi & Bluetooth coexistence is controlled by software rather than hardware.
+		Recommended for heavy traffic scenarios. Both coexistence configuration options are
+		automatically managed, no user intervention is required.
+		If only Bluetooth is used, it is recommended to disable this option to reduce binary file
+		size.
+
+menuconfig ESPRESSIF_WIFI_BT_COEXIST
+	bool "Wi-Fi and BT coexist"
+	default y if ESPRESSIF_WIFI && ESPRESSIF_BLE
+	default n
+	depends on ESPRESSIF_WIFI && ESPRESSIF_BLE
+	select ESPRESSIF_WIFI_STA_DISCONNECT_PM
+
 menu "Wi-Fi Configuration"
 	depends on ESPRESSIF_WIFI
 
@@ -692,3 +721,22 @@ config ESPRESSIF_WIFI_LISTEN_INTERVAL
 		to beacon is 300 ms.
 
 endmenu # ESPRESSIF_WIFI
+
+menu "BLE Configuration"
+	depends on ESPRESSIF_BLE
+
+config ESPRESSIF_BLE_TASK_STACK_SIZE
+	int "Controller task stack size"
+	default 4096
+
+config ESPRESSIF_BLE_TASK_PRIORITY
+	int "Controller task priority"
+	default 253
+
+config ESPRESSIF_BLE_INTERRUPT_SAVE_STATUS
+	int "Number of interrupt save status"
+	default 3
+	---help---
+		Number of interrupt save status variables to keep track. Increase it if any related bug is found.
+
+endmenu # BLE Configuration

arch/xtensa/src/common/espressif/Wireless.mk

@@ -20,13 +20,24 @@
 #
 ############################################################################
 
+ifeq ($(CONFIG_ARCH_CHIP_ESP32S3),y)
+INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)bt$(DELIM)include$(DELIM)esp32c3$(DELIM)include
+INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_coex$(DELIM)include
+endif
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)soc$(DELIM)$(CHIP_SERIES)$(DELIM)include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)nuttx$(DELIM)$(CHIP_SERIES)$(DELIM)include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)nuttx$(DELIM)include$(DELIM)esp_wifi
 
+ifeq ($(CONFIG_ARCH_CHIP_ESP32S3),y)
+EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)bt$(DELIM)controller$(DELIM)lib_esp32c3_family$(DELIM)$(CHIP_SERIES)
+EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_coex$(DELIM)lib$(DELIM)$(CHIP_SERIES)
+endif
 EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_phy$(DELIM)lib$(DELIM)$(CHIP_SERIES)
 EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_wifi$(DELIM)lib$(DELIM)$(CHIP_SERIES)
 
+ifeq ($(CONFIG_ARCH_CHIP_ESP32S3),y)
+EXTRA_LIBS += -lcoexist
+endif
 EXTRA_LIBS += -lphy
 
 ifeq ($(CONFIG_ESPRESSIF_WIFI),y)

arch/xtensa/src/common/espressif/esp_wifi_utils.c

@@ -37,6 +37,9 @@
 #ifdef CONFIG_ARCH_CHIP_ESP32S2
 #include "esp32s2_wifi_adapter.h"
 #endif
+#ifdef CONFIG_ARCH_CHIP_ESP32S3
+#include "esp32s3_wifi_adapter.h"
+#endif
 
 #include "esp_wifi_utils.h"
 #include "esp_wireless.h"

arch/xtensa/src/common/espressif/esp_wlan.h

@@ -32,6 +32,9 @@
 #ifdef CONFIG_ARCH_CHIP_ESP32S2
 #  include "esp32s2_wifi_adapter.h"
 #endif
+#ifdef CONFIG_ARCH_CHIP_ESP32S3
+#  include "esp32s3_wifi_adapter.h"
+#endif
 
 #ifndef __ASSEMBLY__
 

arch/xtensa/src/esp32s3/Kconfig

@@ -655,31 +655,6 @@ config ESP32S3_UART2
 	select UART2_SERIALDRIVER
 	select ARCH_HAVE_SERIAL_TERMIOS
 
-config ESP32S3_WIRELESS
-	bool
-	default n
-	select NET
-	select ARCH_PHY_INTERRUPT
-	select ESP32S3_RNG
-	select ESP32S3_RT_TIMER
-	select ESP32S3_TIMER0
-	---help---
-		Enable Wireless support
-
-config ESP32S3_WIFI
-	bool "Wi-Fi"
-	default n
-	select ESP32S3_WIRELESS
-	---help---
-		Enable Wi-Fi support
-
-config ESP32S3_BLE
-	bool "BLE"
-	default n
-	select ESP32S3_WIRELESS
-	---help---
-		Enable BLE support
-
 config ESP32S3_I2C0
 	bool "I2C 0"
 	default n
@@ -822,13 +797,6 @@ config ESP32S3_AES_ACCELERATOR
 
 endmenu # ESP32-S3 Peripheral Selection
 
-menuconfig ESP32S3_WIFI_BT_COEXIST
-	bool "Wi-Fi and BT coexist"
-	default y if ESP32S3_WIFI && ESP32S3_BLE
-	default n
-	depends on ESP32S3_WIFI && ESP32S3_BLE
-	select ESP32S3_WIFI_STA_DISCONNECT_PM
-
 menu "Interrupt Configuration"
 
 config ESP32S3_IRAM_ISR_DEBUG
@@ -1494,180 +1462,10 @@ config ESP32S3_TWAI_REGDEBUG
 
 endmenu #ESP32S3_TWAI
 
-menu "Wi-Fi Configuration"
-	depends on ESP32S3_WIFI
-
-menu "ESP WPA-Supplicant"
-
-config WPA_WAPI_PSK
-	bool "Enable WAPI PSK support"
-	default n
-	---help---
-		Select this option to enable WAPI-PSK
-		which is a Chinese National Standard Encryption for Wireless LANs (GB 15629.11-2003).
-
-config WPA_SUITE_B_192
-	bool "Enable NSA suite B support with 192-bit key"
-	default n
-	select ESP_WIFI_GCMP_SUPPORT
-	select ESP_WIFI_GMAC_SUPPORT
-	---help---
-		Select this option to enable 192-bit NSA suite-B.
-		This is necessary to support WPA3 192-bit security.
-
-config ESP_WPA_DEBUG_PRINT
-	bool "Print debug messages from Espressif's WPA Supplicant"
-	default n
-	---help---
-		Select this option to print logging information from WPA supplicant,
-		this includes handshake information and key hex dumps depending
-		on the project logging level.
-
-		Enabling this could increase the build size ~60kb
-		depending on the project logging level.
-
-endmenu # ESP WPA-Supplicant
-
-choice
-	prompt "ESP32S3 Wi-Fi mode"
-	default ESP32S3_WIFI_STATION
-
-config ESP32S3_WIFI_STATION
-	bool "Station mode"
-
-config ESP32S3_WIFI_SOFTAP
-	bool "SoftAP mode"
-
-config ESP32S3_WIFI_STATION_SOFTAP
-	bool "Station + SoftAP"
-
-endchoice # ESP32S3 Wi-Fi mode
-
-config ESP_WIFI_ENABLE_SAE_PK
-	bool "Enable SAE-PK"
-	default y
-	---help---
-		Select this option to enable SAE-PK
-
-config ESP_WIFI_ENABLE_WPA3_OWE_STA
-	bool "Enable OWE STA"
-	default y
-	---help---
-		Select this option to allow the device to establish OWE connection with eligible AP's.
-		PMF (Protected Management Frames) is a prerequisite feature for a WPA3 connection, it needs to be
-		explicitly configured before attempting connection. Please refer to the Wi-Fi Driver API Guide for details.
-
-config ESP32S3_WIFI_STATIC_RXBUF_NUM
-	int "Wi-Fi static RX buffer number"
-	default 10
-
-config ESP32S3_WIFI_DYNAMIC_RXBUF_NUM
-	int "Wi-Fi dynamic RX buffer number"
-	default 32
-
-config ESP32S3_WIFI_DYNAMIC_TXBUF_NUM
-	int "Wi-Fi dynamic TX buffer number"
-	default 32
-
-config ESP32S3_WIFI_TX_AMPDU
-	bool "Wi-Fi TX AMPDU"
-	default y
-
-config ESP32S3_WIFI_RX_AMPDU
-	bool "Wi-Fi RX AMPDU"
-	default y
-
-config ESP32S3_WIFI_RXBA_AMPDU_WZ
-	int "Wi-Fi RX BA AMPDU windown size"
-	default 6
-
-config ESP32S3_WLAN_PKTBUF_NUM
-	int "WLAN netcard packet buffer number per netcard"
-	default 16
-
-config ESP_WIFI_GCMP_SUPPORT
-	bool "WiFi GCMP Support(GCMP128 and GCMP256)"
-	default n
-	---help---
-		Select this option to enable GCMP support. GCMP support is compulsory for WiFi Suite-B support.
-
-config ESP_WIFI_GMAC_SUPPORT
-	bool "WiFi GMAC Support(GMAC128 and GMAC256)"
-	default n
-	---help---
-		Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192-bit certification.
-
-config ESP32S3_WIFI_CONNECT_TIMEOUT
-	int "Connect timeout in second"
-	default 10
-	---help---
-		Max waiting time of connecting to AP.
-
-config ESP32S3_WIFI_SCAN_RESULT_SIZE
-	int "Scan result buffer"
-	default 4096
-	---help---
-		Maximum scan result buffer size.
-
-config ESP32S3_WIFI_STA_DISCONNECT_PM
-	bool "Power Management for station when disconnected"
-	default y
-	---help---
-		Select this option to enable power management for station when disconnected.
-		Chip will do modem-sleep when RF module is not in use anymore.
-
-choice ESP32S3_POWER_SAVE_MODE
-	prompt "Wi-Fi Power save mode"
-	default ESP32S3_POWER_SAVE_MIN_MODEM if ESP32S3_WIFI_BT_COEXIST
-	default ESP32S3_POWER_SAVE_NONE
-	---help---
-		Wi-Fi supports the Modem-sleep mode which refers to the legacy power-saving mode in the IEEE 802.11 protocol.
-		Modem-sleep mode works in station-only mode and the station must connect to the AP first. If the Modem-sleep
-		mode is enabled, station will switch between active and sleep state periodically. In sleep state, RF, PHY and
-		BB are turned off in order to reduce power consumption. Station can keep connection with AP in modem-sleep mode.
-
-		Modem-sleep mode includes minimum and maximum power-saving modes.
-
-		In minimum power-saving mode, station wakes
-		up every DTIM to receive beacon. Broadcast data will not be lost because it is transmitted after DTIM.
-		However, it cannot save much more power if DTIM is short for DTIM is determined by AP.
-
-		In maximum power-saving mode, station wakes up in every listen interval to receive beacon. This listen interval
-		can be set to be longer than the AP DTIM period. Broadcast data may be lost because station may be in sleep
-		state at DTIM time. If listen interval is longer, more power is saved, but broadcast data is more easy to lose.
-		Listen interval can be configured by setting ESP32S3_WIFI_LISTEN_INTERVAL.
-
-		ESP32S3_POWER_SAVE_NONE disables Modem-sleep mode entirely. Disabling it increases power consumption, but
-		minimizes the delay in receiving Wi-Fi data in real time. When Modem-sleep mode is enabled, the delay in
-		receiving Wi-Fi data may be the same as the DTIM cycle (minimum power-saving mode) or the listening interval
-		(maximum power-saving mode). Setting ESP32S3_POWER_SAVE_NONE is suitable when high throughput is required.
-
-config ESP32S3_POWER_SAVE_NONE
-	bool "No power save"
-
-config ESP32S3_POWER_SAVE_MIN_MODEM
-	bool "Minimum modem power saving."
-
-config ESP32S3_POWER_SAVE_MAX_MODEM
-	bool "Maximum modem power saving"
-
-endchoice # ESP32S3_POWER_SAVE_MODE
-
-config ESP32S3_WIFI_LISTEN_INTERVAL
-	int "Wi-Fi listen interval"
-	depends on ESP32S3_POWER_SAVE_MAX_MODEM
-	default 3
-	---help---
-		Interval for station to listen to beacon from AP. The unit of listen interval is one beacon interval.
-		For example, if beacon interval is 100 ms and listen interval is 3, the interval for station to listen
-		to beacon is 300 ms.
-
-endmenu # ESP32S3_WIFI
-
 config ESP32S3_OPENETH
 	bool "Opencores Ethernet MAC"
 	default n
-	depends on !ESP32S3_WIFI
+	depends on !ESPRESSIF_WIFI
 	select NET
 	select SCHED_WORKQUEUE
 	---help---
@@ -1685,29 +1483,10 @@ config ESP32S3_OPENETH_DMA_RX_BUFFER_NUM
 
 endif # ESP32S3_OPENETH
 
-menu "BLE Configuration"
-	depends on ESP32S3_BLE
-
-config ESP32S3_BLE_TASK_STACK_SIZE
-	int "Controller task stack size"
-	default 4096
-
-config ESP32S3_BLE_TASK_PRIORITY
-	int "Controller task priority"
-	default 253
-
-config ESP32S3_BLE_INTERRUPT_SAVE_STATUS
-	int "Number of interrupt save status"
-	default 3
-	---help---
-		Number of interrupt save status variables to keep track. Increase it if any related bug is found.
-
-endmenu # BLE Configuration
-
 choice ESP32S3_UNIVERSAL_MAC_ADDRESSES
 	bool "Number of universally administered (by IEEE) MAC address"
 	default ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR
-	depends on ESP32S3_WIFI || ESP32S3_BLE
+	depends on ESPRESSIF_WIFI || ESPRESSIF_BLE
 	---help---
 		Configure the number of universally administered (by IEEE) MAC addresses.
 		During initialization, MAC addresses for each network interface are generated or derived from a

arch/xtensa/src/esp32s3/Make.defs

@@ -208,6 +208,15 @@ ifeq ($(CONFIG_ESP32S3_OPENETH),y)
 CHIP_CSRCS += esp_openeth.c
 endif
 
+ifeq ($(CONFIG_ESPRESSIF_WIFI),y)
+CHIP_CSRCS += esp32s3_wifi_adapter.c
+endif
+
+ifeq ($(CONFIG_ESPRESSIF_BLE),y)
+CHIP_CSRCS += esp32s3_ble_adapter.c esp32s3_ble.c
+EXTRA_LIBS += -lbtbb -lbtdm_app
+endif
+
 #############################################################################
 # Espressif HAL for 3rd Party Platforms
 #############################################################################
@@ -216,7 +225,7 @@ endif
 
 ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
 ifndef ESP_HAL_3RDPARTY_VERSION
-	ESP_HAL_3RDPARTY_VERSION = 87ccbf88b6fd490dae1993524e70f51bb2ea181d
+	ESP_HAL_3RDPARTY_VERSION = e5cef265cca9d272c428d210453d574bcc25c5f4
 endif
 
 ifndef ESP_HAL_3RDPARTY_URL
@@ -269,7 +278,7 @@ include chip/hal.mk
 include common/espressif/Make.defs
 
 context:: chip/$(ESP_HAL_3RDPARTY_REPO)
-ifeq ($(CONFIG_ESP32S3_WIRELESS),y)
+ifeq ($(CONFIG_ESPRESSIF_WIRELESS),y)
 	$(Q) echo "Espressif HAL for 3rd Party Platforms: initializing submodules..."
 	$(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) submodule --quiet update --init $(GIT_DEPTH_PARAMETER) components/mbedtls/mbedtls components/esp_phy/lib components/esp_wifi/lib components/bt/controller/lib_esp32c3_family components/esp_coex/lib
 	$(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO)/components/mbedtls/mbedtls reset --quiet --hard
@@ -277,9 +286,5 @@ ifeq ($(CONFIG_ESP32S3_WIRELESS),y)
 	$(Q) cd chip/$(ESP_HAL_3RDPARTY_REPO)/components/mbedtls/mbedtls && git apply ../../../nuttx/patches/components/mbedtls/mbedtls/*.patch
 endif
 
-ifeq ($(CONFIG_ESP32S3_WIRELESS),y)
-include chip/Wireless.mk
-endif
-
 distclean::
 	$(call DELDIR,chip/$(ESP_HAL_3RDPARTY_REPO))

arch/xtensa/src/esp32s3/Wireless.mk

@@ -1,256 +0,0 @@
-############################################################################
-# arch/xtensa/src/esp32s3/Wireless.mk
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)bt$(DELIM)include$(DELIM)esp32c3$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_coex$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)soc$(DELIM)$(CHIP_SERIES)$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)nuttx$(DELIM)$(CHIP_SERIES)$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)nuttx$(DELIM)include$(DELIM)esp_wifi
-
-EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)bt$(DELIM)controller$(DELIM)lib_esp32c3_family$(DELIM)$(CHIP_SERIES)
-EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_coex$(DELIM)lib$(DELIM)$(CHIP_SERIES)
-EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_phy$(DELIM)lib$(DELIM)$(CHIP_SERIES)
-EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_wifi$(DELIM)lib$(DELIM)$(CHIP_SERIES)
-
-EXTRA_LIBS += -lphy -lcoexist
-
-# Wireless interfaces.
-
-CHIP_CSRCS += esp32s3_wireless.c
-
-ifeq ($(CONFIG_ESP32S3_BLE),y)
-CHIP_CSRCS += esp32s3_ble_adapter.c esp32s3_ble.c
-EXTRA_LIBS += -lbtbb -lbtdm_app
-endif
-
-ifeq ($(CONFIG_ESP32S3_WIFI),y)
-CHIP_CSRCS += esp32s3_wlan.c esp32s3_wifi_utils.c esp32s3_wifi_adapter.c
-EXTRA_LIBS += -lcore -lnet80211 -lpp
-
-ifeq ($(CONFIG_WPA_WAPI_PSK),y)
-EXTRA_LIBS += -lwapi
-endif
-
-## ESP-IDF's mbedTLS
-
-VPATH += chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)mbedtls$(DELIM)mbedtls$(DELIM)library
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)mbedtls$(DELIM)mbedtls$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)mbedtls$(DELIM)mbedtls$(DELIM)library
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)mbedtls$(DELIM)port$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)nuttx$(DELIM)include$(DELIM)mbedtls
-
-### Define Espressif's configs for mbedTLS
-
-CFLAGS += $(DEFINE_PREFIX)MBEDTLS_CONFIG_FILE="<mbedtls/esp_config.h>"
-
-CHIP_CSRCS += aes.c
-CHIP_CSRCS += aria.c
-CHIP_CSRCS += bignum_core.c
-CHIP_CSRCS += bignum.c
-CHIP_CSRCS += ccm.c
-CHIP_CSRCS += cipher_wrap.c
-CHIP_CSRCS += cipher.c
-CHIP_CSRCS += cmac.c
-CHIP_CSRCS += constant_time.c
-CHIP_CSRCS += ctr_drbg.c
-CHIP_CSRCS += ecp_curves.c
-CHIP_CSRCS += ecp.c
-CHIP_CSRCS += entropy.c
-CHIP_CSRCS += gcm.c
-CHIP_CSRCS += md.c
-CHIP_CSRCS += pkcs5.c
-CHIP_CSRCS += platform_util.c
-CHIP_CSRCS += platform.c
-CHIP_CSRCS += sha1.c
-CHIP_CSRCS += sha3.c
-CHIP_CSRCS += sha256.c
-CHIP_CSRCS += sha512.c
-CHIP_CSRCS += pk.c
-CHIP_CSRCS += pk_wrap.c
-CHIP_CSRCS += pkparse.c
-CHIP_CSRCS += ecdsa.c
-CHIP_CSRCS += asn1parse.c
-CHIP_CSRCS += asn1write.c
-CHIP_CSRCS += rsa.c
-CHIP_CSRCS += md5.c
-CHIP_CSRCS += oid.c
-CHIP_CSRCS += pem.c
-CHIP_CSRCS += hmac_drbg.c
-CHIP_CSRCS += rsa_alt_helpers.c
-CHIP_CSRCS += ecdh.c
-CHIP_CSRCS += pk_ecc.c
-
-VPATH += chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)mbedtls$(DELIM)port
-
-CHIP_CSRCS += esp_hardware.c
-CHIP_CSRCS += esp_mem.c
-CHIP_CSRCS += esp_timing.c
-
-VPATH += chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)mbedtls$(DELIM)port$(DELIM)md
-
-CHIP_CSRCS += esp_md.c
-
-## WPA Supplicant
-
-WIFI_WPA_SUPPLICANT = chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)wpa_supplicant
-
-CFLAGS += $(DEFINE_PREFIX)__ets__
-CFLAGS += $(DEFINE_PREFIX)CONFIG_CRYPTO_MBEDTLS
-CFLAGS += $(DEFINE_PREFIX)CONFIG_ECC
-CFLAGS += $(DEFINE_PREFIX)CONFIG_IEEE80211W
-CFLAGS += $(DEFINE_PREFIX)CONFIG_WPA3_SAE
-CFLAGS += $(DEFINE_PREFIX)EAP_PEER_METHOD
-CFLAGS += $(DEFINE_PREFIX)ESP_PLATFORM=1
-CFLAGS += $(DEFINE_PREFIX)ESP_SUPPLICANT
-CFLAGS += $(DEFINE_PREFIX)ESPRESSIF_USE
-CFLAGS += $(DEFINE_PREFIX)IEEE8021X_EAPOL
-CFLAGS += $(DEFINE_PREFIX)USE_WPA2_TASK
-CFLAGS += $(DEFINE_PREFIX)CONFIG_SHA256
-CFLAGS += $(DEFINE_PREFIX)CONFIG_SAE
-CFLAGS += $(DEFINE_PREFIX)USE_WPS_TASK
-
-ifeq ($(CONFIG_ESP_WIFI_ENABLE_SAE_PK),y)
-CFLAGS += $(DEFINE_PREFIX)CONFIG_SAE_PK
-endif
-
-ifeq ($(CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA),y)
-CFLAGS += $(DEFINE_PREFIX)CONFIG_OWE_STA
-endif
-
-ifeq ($(CONFIG_ESP_WIFI_GCMP_SUPPORT),y)
-CFLAGS += $(DEFINE_PREFIX)CONFIG_GCMP
-endif
-
-ifeq ($(CONFIG_ESP_WIFI_GMAC_SUPPORT),y)
-CFLAGS += $(DEFINE_PREFIX)CONFIG_GMAC
-endif
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)include
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)src
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)ap
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)ap
-
-CHIP_CSRCS += ap_config.c
-CHIP_CSRCS += ieee802_11.c
-CHIP_CSRCS += comeback_token.c
-CHIP_CSRCS += pmksa_cache_auth.c
-CHIP_CSRCS += sta_info.c
-CHIP_CSRCS += wpa_auth_ie.c
-CHIP_CSRCS += wpa_auth.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)common
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)common
-
-CHIP_CSRCS += dragonfly.c
-CHIP_CSRCS += sae.c
-CHIP_CSRCS += wpa_common.c
-CHIP_CSRCS += sae_pk.c
-CHIP_CSRCS += bss.c
-CHIP_CSRCS += scan.c
-CHIP_CSRCS += ieee802_11_common.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)crypto
-
-CHIP_CSRCS += aes-ccm.c
-CHIP_CSRCS += aes-gcm.c
-CHIP_CSRCS += aes-omac1.c
-CHIP_CSRCS += aes-unwrap.c
-CHIP_CSRCS += aes-wrap.c
-CHIP_CSRCS += ccmp.c
-CHIP_CSRCS += crypto_ops.c
-CHIP_CSRCS += des-internal.c
-CHIP_CSRCS += dh_groups.c
-CHIP_CSRCS += rc4.c
-CHIP_CSRCS += sha1-prf.c
-CHIP_CSRCS += sha256-kdf.c
-CHIP_CSRCS += sha256-prf.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)eap_peer
-
-CHIP_CSRCS += chap.c
-CHIP_CSRCS += eap_common.c
-CHIP_CSRCS += eap_mschapv2.c
-CHIP_CSRCS += eap_peap_common.c
-CHIP_CSRCS += eap_peap.c
-CHIP_CSRCS += eap_tls_common.c
-CHIP_CSRCS += eap_tls.c
-CHIP_CSRCS += eap_ttls.c
-CHIP_CSRCS += eap.c
-CHIP_CSRCS += mschapv2.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)rsn_supp
-
-CHIP_CSRCS += pmksa_cache.c
-CHIP_CSRCS += wpa_ie.c
-CHIP_CSRCS += wpa.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)utils
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)utils
-
-CHIP_CSRCS += base64.c
-CHIP_CSRCS += bitfield.c
-CHIP_CSRCS += common.c
-CHIP_CSRCS += ext_password.c
-CHIP_CSRCS += json.c
-CHIP_CSRCS += uuid.c
-CHIP_CSRCS += wpa_debug.c
-CHIP_CSRCS += wpabuf.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)port
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)port$(DELIM)include
-
-CHIP_CSRCS += eloop.c
-CHIP_CSRCS += os_xtensa.c
-
-## ESP Supplicant (Espressif's WPA supplicant extension)
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)esp_supplicant$(DELIM)include
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)esp_supplicant$(DELIM)src
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)esp_supplicant$(DELIM)src
-
-CHIP_CSRCS += esp_common.c
-CHIP_CSRCS += esp_hostap.c
-CHIP_CSRCS += esp_wpa_main.c
-CHIP_CSRCS += esp_wpa3.c
-CHIP_CSRCS += esp_wpas_glue.c
-CHIP_CSRCS += esp_owe.c
-CHIP_CSRCS += esp_scan.c
-CHIP_CSRCS += esp_wps.c
-
-VPATH += $(WIFI_WPA_SUPPLICANT)$(DELIM)esp_supplicant$(DELIM)src$(DELIM)crypto
-
-INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)$(WIFI_WPA_SUPPLICANT)$(DELIM)src$(DELIM)crypto
-
-CHIP_CSRCS += crypto_mbedtls-bignum.c
-CHIP_CSRCS += crypto_mbedtls-ec.c
-CHIP_CSRCS += crypto_mbedtls-rsa.c
-CHIP_CSRCS += crypto_mbedtls.c
-CHIP_CSRCS += tls_mbedtls.c
-CHIP_CSRCS += aes-siv.c
-
-endif

arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c

@@ -58,7 +58,7 @@
 #include "esp32s3_rt_timer.h"
 #include "esp32s3_rtc.h"
 #include "esp32s3_spiflash.h"
-#include "esp32s3_wireless.h"
+#include "espressif/esp_wireless.h"
 
 #include "esp_bt.h"
 #include "esp_log.h"
@@ -104,8 +104,8 @@
 #  define BLE_TASK_EVENT_QUEUE_LEN        8
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE_INTERRUPT_SAVE_STATUS
+#ifdef CONFIG_ESPRESSIF_BLE_INTERRUPT_SAVE_STATUS
-#  define NR_IRQSTATE_FLAGS   CONFIG_ESP32S3_BLE_INTERRUPT_SAVE_STATUS
+#  define NR_IRQSTATE_FLAGS   CONFIG_ESPRESSIF_BLE_INTERRUPT_SAVE_STATUS
 #else
 #  define NR_IRQSTATE_FLAGS   3
 #endif
@@ -1845,7 +1845,7 @@ static void coex_wifi_sleep_set_hook(bool sleep)
  * Description:
  *   This is a wrapper for registering a BTDM callback with the coexistence
  *   scheme. If the Wi-Fi and Bluetooth coexistence feature is enabled
- *   (CONFIG_ESP32S3_WIFI_BT_COEXIST), it calls the
+ *   (CONFIG_ESPRESSIF_WIFI_BT_COEXIST), it calls the
  *   coex_schm_register_callback function with COEX_SCHM_CALLBACK_TYPE_BT
  *   and the provided callback. If the feature is not enabled, it returns 0.
  *
@@ -1860,7 +1860,7 @@ static void coex_wifi_sleep_set_hook(bool sleep)
 
 static int coex_schm_register_btdm_callback_wrapper(void *callback)
 {
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   return coex_schm_register_callback(COEX_SCHM_CALLBACK_TYPE_BT, callback);
 #else
   return 0;
@@ -1884,7 +1884,7 @@ static int coex_schm_register_btdm_callback_wrapper(void *callback)
 
 static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status)
 {
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   coex_schm_status_bit_set(type, status);
 #endif
 }
@@ -1907,7 +1907,7 @@ static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status)
 static void coex_schm_status_bit_clear_wrapper(uint32_t type,
                                                uint32_t status)
 {
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   coex_schm_status_bit_clear(type, status);
 #endif
 }
@@ -1917,7 +1917,7 @@ static void coex_schm_status_bit_clear_wrapper(uint32_t type,
  *
  * Description:
  *   This is a wrapper for coex_schm_interval_get. If the WiFi and Bluetooth
- *   coexistence feature is enabled (CONFIG_ESP32S3_WIFI_BT_COEXIST), it
+ *   coexistence feature is enabled (CONFIG_ESPRESSIF_WIFI_BT_COEXIST), it
  *   calls the function and returns its result. If not enabled, it returns 0.
  *
  * Input Parameters:
@@ -1931,7 +1931,7 @@ static void coex_schm_status_bit_clear_wrapper(uint32_t type,
 
 static uint32_t coex_schm_interval_get_wrapper(void)
 {
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   return coex_schm_interval_get();
 #else
   return 0;
@@ -1944,8 +1944,8 @@ static uint32_t coex_schm_interval_get_wrapper(void)
  * Description:
  *   This is a wrapper for coex_schm_curr_period_get. If the WiFi and
  *   Bluetooth coexistence feature is enabled
- *   (CONFIG_ESP32S3_WIFI_BT_COEXIST), it calls the function and returns its
+ *   (CONFIG_ESPRESSIF_WIFI_BT_COEXIST), it calls the function and returns
- *   result. If the feature is not enabled, it returns 1.
+ *   its result. If the feature is not enabled, it returns 1.
  *
  * Input Parameters:
  *   None
@@ -1958,7 +1958,7 @@ static uint32_t coex_schm_interval_get_wrapper(void)
 
 static uint8_t coex_schm_curr_period_get_wrapper(void)
 {
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   return coex_schm_curr_period_get();
 #else
   return 1;
@@ -1971,8 +1971,8 @@ static uint8_t coex_schm_curr_period_get_wrapper(void)
  * Description:
  *   This is a wrapper for coex_schm_curr_phase_get. If the WiFi and
  *   Bluetooth coexistence feature is enabled
- *   (CONFIG_ESP32S3_WIFI_BT_COEXIST), it calls the function and returns its
+ *   (CONFIG_ESPRESSIF_WIFI_BT_COEXIST), it calls the function and returns
- *   result. If the feature is not enabled, it returns NULL.
+ *   its result. If the feature is not enabled, it returns NULL.
  *
  * Input Parameters:
  *   None
@@ -1985,7 +1985,7 @@ static uint8_t coex_schm_curr_period_get_wrapper(void)
 
 static void * coex_schm_curr_phase_get_wrapper(void)
 {
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   return coex_schm_curr_phase_get();
 #else
   return NULL;
@@ -2627,7 +2627,7 @@ static esp_err_t btdm_low_power_mode_init(esp_bt_controller_config_t *cfg)
           break;
         }
 
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
       coex_update_lpclk_interval();
 #endif
 
@@ -2767,7 +2767,7 @@ static void btdm_low_power_mode_deinit(void)
 
       btdm_lpclk_select_src(BTDM_LPCLK_SEL_RTC_SLOW);
       btdm_lpclk_set_div(0);
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
       coex_update_lpclk_interval();
 #endif
     }
@@ -3076,8 +3076,8 @@ int esp32s3_bt_controller_init(void)
         }
     }
 
-  cfg->controller_task_stack_size = CONFIG_ESP32S3_BLE_TASK_STACK_SIZE;
+  cfg->controller_task_stack_size = CONFIG_ESPRESSIF_BLE_TASK_STACK_SIZE;
-  cfg->controller_task_prio       = CONFIG_ESP32S3_BLE_TASK_PRIORITY;
+  cfg->controller_task_prio       = CONFIG_ESPRESSIF_BLE_TASK_PRIORITY;
   cfg->controller_task_run_cpu    = CONFIG_BT_CTRL_PINNED_TO_CORE;
   cfg->magic                      = ESP_BT_CTRL_CONFIG_MAGIC_VAL;
 
@@ -3113,7 +3113,7 @@ int esp32s3_bt_controller_init(void)
       goto error;
     }
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   coex_init();
 #endif
 
@@ -3213,7 +3213,7 @@ int esp32s3_bt_controller_enable(esp_bt_mode_t mode)
   esp_phy_enable(PHY_MODEM_BT);
   g_lp_stat.phy_enabled = 1;
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   coex_enable();
 #endif
 
@@ -3290,7 +3290,7 @@ error:
     }
 #endif
 
-#if CONFIG_ESP32S3_WIFI_BT_COEXIST
+#if CONFIG_ESPRESSIF_WIFI_BT_COEXIST
     coex_disable();
 #endif
   if (g_lp_stat.phy_enabled)
@@ -3334,7 +3334,7 @@ int esp32s3_bt_controller_disable(void)
 
   async_wakeup_request_end(BTDM_ASYNC_WAKEUP_SRC_DISA);
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   coex_disable();
 #endif
 

arch/xtensa/src/esp32s3/esp32s3_irq.c

@@ -109,7 +109,7 @@
 #define ESP32S3_MAX_PRIORITY    5
 #define ESP32S3_PRIO_INDEX(p)   ((p) - ESP32S3_MIN_PRIORITY)
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 #  define ESP32S3_WIFI_RESERVE_INT  (1 << ESP32S3_CPUINT_MAC)
 #else
 #  define ESP32S3_WIFI_RESERVE_INT  0
@@ -485,7 +485,7 @@ void up_irqinitialize(void)
   g_irqmap[XTENSA_IRQ_SWINT]  = IRQ_MKMAP(0, ESP32S3_CPUINT_SOFTWARE1);
   g_irqmap[XTENSA_IRQ_SWINT]  = IRQ_MKMAP(1, ESP32S3_CPUINT_SOFTWARE1);
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   g_irqmap[ESP32S3_IRQ_MAC] = IRQ_MKMAP(0, ESP32S3_CPUINT_MAC);
   g_irqmap[ESP32S3_IRQ_PWR] = IRQ_MKMAP(0, ESP32S3_CPUINT_PWR);
 #endif
@@ -496,7 +496,7 @@ void up_irqinitialize(void)
 
   /* Reserve CPU0 interrupt for some special drivers */
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   g_cpu0_intmap[ESP32S3_CPUINT_MAC] = CPUINT_ASSIGN(ESP32S3_IRQ_MAC);
   g_cpu0_intmap[ESP32S3_CPUINT_PWR] = CPUINT_ASSIGN(ESP32S3_IRQ_PWR);
   xtensa_enable_cpuint(&g_intenable[0], 1 << ESP32S3_CPUINT_MAC);

arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.h

@@ -45,20 +45,20 @@ extern "C"
  * Pre-processor Definitions
  ****************************************************************************/
 
-#if defined(CONFIG_ESP32S3_WIFI_STATION)
+#if defined(CONFIG_ESPRESSIF_WIFI_STATION)
-#  define ESP32S3_WLAN_HAS_STA
+#  define ESPRESSIF_WLAN_HAS_STA
-#  define ESP32S3_WLAN_STA_DEVNO    0
+#  define ESPRESSIF_WLAN_STA_DEVNO    0
-#  define ESP32S3_WLAN_DEVS         1
+#  define ESPRESSIF_WLAN_DEVS         1
-#elif defined(CONFIG_ESP32S3_WIFI_SOFTAP)
+#elif defined(CONFIG_ESPRESSIF_WIFI_SOFTAP)
-#  define ESP32S3_WLAN_HAS_SOFTAP
+#  define ESPRESSIF_WLAN_HAS_SOFTAP
-#  define ESP32S3_WLAN_SOFTAP_DEVNO 0
+#  define ESPRESSIF_WLAN_SOFTAP_DEVNO 0
-#  define ESP32S3_WLAN_DEVS         1
+#  define ESPRESSIF_WLAN_DEVS         1
-#elif defined(CONFIG_ESP32S3_WIFI_STATION_SOFTAP)
+#elif defined(CONFIG_ESPRESSIF_WIFI_STATION_SOFTAP)
-#  define ESP32S3_WLAN_HAS_STA
+#  define ESPRESSIF_WLAN_HAS_STA
-#  define ESP32S3_WLAN_HAS_SOFTAP
+#  define ESPRESSIF_WLAN_HAS_SOFTAP
-#  define ESP32S3_WLAN_STA_DEVNO    0
+#  define ESPRESSIF_WLAN_STA_DEVNO    0
-#  define ESP32S3_WLAN_SOFTAP_DEVNO 1
+#  define ESPRESSIF_WLAN_SOFTAP_DEVNO 1
-#  define ESP32S3_WLAN_DEVS         2
+#  define ESPRESSIF_WLAN_DEVS         2
 #endif
 
 #define SSID_MAX_LEN                (32)
@@ -148,7 +148,7 @@ void esp_wifi_free_eb(void *eb);
 
 int esp_wifi_notify_subscribe(pid_t pid, struct sigevent *event);
 
-#ifdef ESP32S3_WLAN_HAS_STA
+#ifdef ESPRESSIF_WLAN_HAS_STA
 
 /****************************************************************************
  * Name: esp_wifi_sta_start
@@ -484,9 +484,9 @@ int esp_wifi_sta_country(struct iwreq *iwr, bool set);
  ****************************************************************************/
 
 int esp_wifi_sta_rssi(struct iwreq *iwr, bool set);
-#endif /* ESP32S3_WLAN_HAS_STA */
+#endif /* ESPRESSIF_WLAN_HAS_STA */
 
-#ifdef ESP32S3_WLAN_HAS_SOFTAP
+#ifdef ESPRESSIF_WLAN_HAS_SOFTAP
 
 /****************************************************************************
  * Name: esp_wifi_softap_start
@@ -822,10 +822,10 @@ int esp_wifi_softap_country(struct iwreq *iwr, bool set);
  ****************************************************************************/
 
 int esp_wifi_softap_rssi(struct iwreq *iwr, bool set);
-#endif /* ESP32S3_WLAN_HAS_SOFTAP */
+#endif /* ESPRESSIF_WLAN_HAS_SOFTAP */
 
 /****************************************************************************
- * Name: esp32s3_wifi_bt_coexist_init
+ * Name: esp_wifi_bt_coexist_init
  *
  * Description:
  *   Initialize ESP32-S3 Wi-Fi and BT coexistance module.
@@ -839,8 +839,8 @@ int esp_wifi_softap_rssi(struct iwreq *iwr, bool set);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
-int esp32s3_wifi_bt_coexist_init(void);
+int esp_wifi_bt_coexist_init(void);
 #endif
 
 /****************************************************************************

arch/xtensa/src/esp32s3/esp32s3_wifi_utils.h

@@ -1,104 +0,0 @@
-/****************************************************************************
- * arch/xtensa/src/esp32s3/esp32s3_wifi_utils.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#ifndef __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WIFI_UTILS_H
-#define __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WIFI_UTILS_H
-
-#include <nuttx/config.h>
-#include <nuttx/net/netdev.h>
-
-#ifndef __ASSEMBLY__
-
-#include <stdint.h>
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: esp_wifi_start_scan
- *
- * Description:
- *   Scan all available APs.
- *
- * Input Parameters:
- *   iwr - The argument of the ioctl cmd
- *
- * Returned Value:
- *   OK on success (positive non-zero values are cmd-specific)
- *   Negated errno returned on failure.
- *
- ****************************************************************************/
-
-int esp_wifi_start_scan(struct iwreq *iwr);
-
-/****************************************************************************
- * Name: esp_wifi_get_scan_results
- *
- * Description:
- *   Get scan result
- *
- * Input Parameters:
- *   req      The argument of the ioctl cmd
- *
- * Returned Value:
- *   OK on success (positive non-zero values are cmd-specific)
- *   Negated errno returned on failure.
- *
- ****************************************************************************/
-
-int esp_wifi_get_scan_results(struct iwreq *iwr);
-
-/****************************************************************************
- * Name: esp_wifi_scan_event_parse
- *
- * Description:
- *   Parse scan information
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *     None
- *
- ****************************************************************************/
-
-void esp_wifi_scan_event_parse(void);
-
-#ifdef __cplusplus
-}
-#endif
-#undef EXTERN
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WIFI_UTILS_H */

arch/xtensa/src/esp32s3/esp32s3_wireless.h

@@ -1,370 +0,0 @@
-/****************************************************************************
- * arch/xtensa/src/esp32s3/esp32s3_wireless.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WIRELESS_H
-#define __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WIRELESS_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-#include <semaphore.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <nuttx/config.h>
-#include <nuttx/list.h>
-
-#include "esp_attr.h"
-#include "esp32s3_rt_timer.h"
-
-#include "esp_log.h"
-#include "esp_mac.h"
-#include "esp_private/phy.h"
-#include "esp_private/wifi.h"
-#include "esp_random.h"
-#include "esp_timer.h"
-#include "rom/ets_sys.h"
-#include "soc/soc_caps.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Note: Don't remove these definitions, they are needed by the 3rdparty IDF
- * headers
- */
-
-#define CONFIG_MAC_BB_PD                              (0)
-#define MAC_LEN                                       (6)
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/* Semaphore Cache Data */
-
-struct esp_semcache_s
-{
-  struct list_node node;
-
-  sem_t *sem;
-  uint32_t count;
-};
-
-/* Queue Cache Data */
-
-struct esp_queuecache_s
-{
-  struct list_node node;
-
-  struct file *mq_ptr;
-  size_t size;
-  uint8_t *buffer;
-};
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nuttx_err_to_freertos
- *
- * Description:
- *   Transform from Nuttx OS error code to FreeRTOS's pdTRUE or pdFALSE.
- *
- * Input Parameters:
- *   ret - NuttX error code
- *
- * Returned Value:
- *   Wi-Fi adapter error code
- *
- ****************************************************************************/
-
-static inline int32_t nuttx_err_to_freertos(int ret)
-{
-  return ret >= 0;
-}
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: esp_wifi_to_errno
- *
- * Description:
- *   Transform from ESP Wi-Fi error code to NuttX error code
- *
- * Input Parameters:
- *   err - ESP Wi-Fi error code
- *
- * Returned Value:
- *   NuttX error code defined in errno.h
- *
- ****************************************************************************/
-
-int32_t esp_wifi_to_errno(int err);
-
-/****************************************************************************
- * Functions needed by libphy.a
- ****************************************************************************/
-
-/****************************************************************************
- * Name: esp_dport_access_reg_read
- *
- * Description:
- *   Read register value safely in SMP
- *
- * Input Parameters:
- *   reg - Register address
- *
- * Returned Value:
- *   Register value
- *
- ****************************************************************************/
-
-uint32_t IRAM_ATTR esp_dport_access_reg_read(uint32_t reg);
-
-/****************************************************************************
- * Name: phy_printf
- *
- * Description:
- *   Output format string and its arguments
- *
- * Input Parameters:
- *   format - format string
- *
- * Returned Value:
- *   0
- *
- ****************************************************************************/
-
-int phy_printf(const char *format, ...) printf_like(1, 2);
-
-/****************************************************************************
- * Name: esp_timer_create
- *
- * Description:
- *   Create timer with given arguments
- *
- * Input Parameters:
- *   create_args - Timer arguments data pointer
- *   out_handle  - Timer handle pointer
- *
- * Returned Value:
- *   0 if success or -1 if fail
- *
- ****************************************************************************/
-
-int32_t esp_timer_create(const esp_timer_create_args_t *create_args,
-                         esp_timer_handle_t *out_handle);
-
-/****************************************************************************
- * Name: esp_timer_start_once
- *
- * Description:
- *   Start timer with one shot mode
- *
- * Input Parameters:
- *   timer      - Timer handle pointer
- *   timeout_us - Timeout value by micro second
- *
- * Returned Value:
- *   0 if success or -1 if fail
- *
- ****************************************************************************/
-
-int32_t esp_timer_start_once(esp_timer_handle_t timer, uint64_t timeout_us);
-
-/****************************************************************************
- * Name: esp_timer_start_periodic
- *
- * Description:
- *   Start timer with periodic mode
- *
- * Input Parameters:
- *   timer  - Timer handle pointer
- *   period - Timeout value by micro second
- *
- * Returned Value:
- *   0 if success or -1 if fail
- *
- ****************************************************************************/
-
-int32_t esp_timer_start_periodic(esp_timer_handle_t timer, uint64_t period);
-
-/****************************************************************************
- * Name: esp_timer_stop
- *
- * Description:
- *   Stop timer
- *
- * Input Parameters:
- *   timer  - Timer handle pointer
- *
- * Returned Value:
- *   0 if success or -1 if fail
- *
- ****************************************************************************/
-
-int32_t esp_timer_stop(esp_timer_handle_t timer);
-
-/****************************************************************************
- * Name: esp_timer_delete
- *
- * Description:
- *   Delete timer and free resource
- *
- * Input Parameters:
- *   timer  - Timer handle pointer
- *
- * Returned Value:
- *   0 if success or -1 if fail
- *
- ****************************************************************************/
-
-int32_t esp_timer_delete(esp_timer_handle_t timer);
-
-/****************************************************************************
- * Name: esp32s3_phy_update_country_info
- *
- * Description:
- *   Update PHY init data according to country code
- *
- * Input Parameters:
- *   country - PHY init data type
- *
- * Returned Value:
- *   OK on success; a negated errno on failure
- *
- ****************************************************************************/
-
-int esp32s3_phy_update_country_info(const char *country);
-
-/****************************************************************************
- * Name: esp_init_semcache
- *
- * Description:
- *   Initialize semaphore cache.
- *
- * Parameters:
- *   sc  - Semaphore cache data pointer
- *   sem - Semaphore data pointer
- *
- * Returned Value:
- *   None.
- *
- ****************************************************************************/
-
-void esp_init_semcache(struct esp_semcache_s *sc, sem_t *sem);
-
-/****************************************************************************
- * Name: esp_post_semcache
- *
- * Description:
- *   Store posting semaphore action into semaphore cache.
- *
- * Parameters:
- *   sc  - Semaphore cache data pointer
- *
- * Returned Value:
- *   None.
- *
- ****************************************************************************/
-
-void esp_post_semcache(struct esp_semcache_s *sc);
-
-/****************************************************************************
- * Name: esp_init_queuecache
- *
- * Description:
- *   Initialize queue cache.
- *
- * Parameters:
- *   qc     - Queue cache data pointer
- *   mq_ptr - Queue data pointer
- *   buffer - Queue cache buffer pointer
- *   size   - Queue cache buffer size
- *
- * Returned Value:
- *   None.
- *
- ****************************************************************************/
-
-void esp_init_queuecache(struct esp_queuecache_s *qc,
-                         struct file *mq_ptr,
-                         uint8_t *buffer,
-                         size_t size);
-
-/****************************************************************************
- * Name: esp32_wl_send_queuecache
- *
- * Description:
- *   Store posting queue action and data into queue cache.
- *
- * Parameters:
- *   qc     - Queue cache data pointer
- *   buffer - Data buffer
- *   size   - Buffer size
- *
- * Returned Value:
- *   None.
- *
- ****************************************************************************/
-
-void esp_send_queuecache(struct esp_queuecache_s *qc,
-                         uint8_t *buffer,
-                         int size);
-
-/****************************************************************************
- * Name: esp_wireless_init
- *
- * Description:
- *   Initialize ESP32 wireless common components for both BT and Wi-Fi.
- *
- * Parameters:
- *   None
- *
- * Returned Value:
- *   Zero (OK) is returned on success. A negated errno value is returned on
- *   failure.
- *
- ****************************************************************************/
-
-int esp_wireless_init(void);
-
-/****************************************************************************
- * Name: esp_wireless_deinit
- *
- * Description:
- *   De-initialize ESP32 wireless common components.
- *
- * Parameters:
- *   None
- *
- * Returned Value:
- *   Zero (OK) is returned on success. A negated errno value is returned on
- *   failure.
- *
- ****************************************************************************/
-
-int esp_wireless_deinit(void);
-
-#endif /* __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WIRELESS_H */

arch/xtensa/src/esp32s3/esp32s3_wlan.h

@@ -1,111 +0,0 @@
-/****************************************************************************
- * arch/xtensa/src/esp32s3/esp32s3_wlan.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WLAN_H
-#define __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WLAN_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "esp32s3_wifi_adapter.h"
-
-#ifndef __ASSEMBLY__
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-#ifdef CONFIG_ESP32S3_WIFI
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifdef ESP32S3_WLAN_HAS_STA
-
-/****************************************************************************
- * Name: esp32s3_wlan_sta_set_linkstatus
- *
- * Description:
- *   Set Wi-Fi station link status
- *
- * Parameters:
- *   linkstatus - true Notifies the networking layer about an available
- *                carrier, false Notifies the networking layer about an
- *                disappeared carrier.
- *
- * Returned Value:
- *   OK on success; Negated errno on failure.
- *
- ****************************************************************************/
-
-int esp32s3_wlan_sta_set_linkstatus(bool linkstatus);
-
-/****************************************************************************
- * Name: esp32s3_wlan_sta_initialize
- *
- * Description:
- *   Initialize the ESP32-S3 WLAN station netcard driver
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   OK on success; Negated errno on failure.
- *
- ****************************************************************************/
-
-int esp32s3_wlan_sta_initialize(void);
-#endif /* ESP32S3_WLAN_HAS_STA */
-
-/****************************************************************************
- * Name: esp32s3_wlan_softap_initialize
- *
- * Description:
- *   Initialize the ESP32-S3 WLAN softAP netcard driver
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   OK on success; Negated errno on failure.
- *
- ****************************************************************************/
-
-#ifdef ESP32S3_WLAN_HAS_SOFTAP
-int esp32s3_wlan_softap_initialize(void);
-#endif /* ESP32S3_WLAN_HAS_SOFTAP */
-
-#endif /* CONFIG_ESP32S3_WIFI */
-#ifdef __cplusplus
-}
-#endif
-#undef EXTERN
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_XTENSA_SRC_ESP32S3_ESP32S3_WLAN_H */

arch/xtensa/src/esp32s3/hal.mk

@@ -28,6 +28,7 @@ INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)efuse$(DELIM)$(CHIP_SERIES)$(DELIM)include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)efuse$(DELIM)$(CHIP_SERIES)$(DELIM)private_include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_common$(DELIM)include
+INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_coex$(DELIM)include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_event$(DELIM)include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_hw_support$(DELIM)include
 INCLUDES += $(INCDIR_PREFIX)$(ARCH_SRCDIR)$(DELIM)chip$(DELIM)$(ESP_HAL_3RDPARTY_REPO)$(DELIM)components$(DELIM)esp_hw_support$(DELIM)include$(DELIM)esp_private

boards/xtensa/esp32s3/common/include/esp32s3_board_wlan.h

@@ -48,7 +48,7 @@ extern "C"
  * Public Function Prototypes
  ****************************************************************************/
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 
 /****************************************************************************
  * Name: board_wlan_init
@@ -64,7 +64,7 @@ extern "C"
 
 int board_wlan_init(void);
 
-#endif /* CONFIG_ESP32S3_WIFI */
+#endif /* CONFIG_ESPRESSIF_WIFI */
 
 #undef EXTERN
 #if defined(__cplusplus)

boards/xtensa/esp32s3/common/scripts/esp32s3_aliases.ld

@@ -24,10 +24,10 @@
 
 /* Bluetooth needs symbol alias, to be removed after IDF rename it */
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
   api_vhci_host_check_send_available = API_vhci_host_check_send_available;
   api_vhci_host_send_packet = API_vhci_host_send_packet;
   api_vhci_host_register_callback = API_vhci_host_register_callback;
 #endif
 
-PROVIDE( cache_writeback_addr = Cache_WriteBack_Addr );
+PROVIDE( cache_writeback_addr = Cache_WriteBack_Addr );

boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld

@@ -474,7 +474,7 @@ SECTIONS
                     *libarch.a:*cache_hal.* *libarch.a:*mmu_hal.*
                     *libarch.a:*mpu_hal.*) .rodata.*)
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
     *(.rodata_wlog_verbose.*)
     *(.rodata_wlog_debug.*)
     *(.rodata_wlog_info.*)

boards/xtensa/esp32s3/common/scripts/legacy_sections.ld

@@ -303,7 +303,7 @@ SECTIONS
 
     *(.rodata)
     *(.rodata.*)
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
     *(.rodata_wlog_verbose.*)
     *(.rodata_wlog_debug.*)
     *(.rodata_wlog_info.*)

boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld

@@ -79,7 +79,7 @@ SECTIONS
                     *libarch.a:*cache_hal.* *libarch.a:*mmu_hal.*
                     *libarch.a:*mpu_hal.*) .rodata.*)
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
     *(.rodata_wlog_verbose.*)
     *(.rodata_wlog_debug.*)
     *(.rodata_wlog_info.*)

boards/xtensa/esp32s3/common/src/Make.defs

@@ -38,7 +38,7 @@ ifeq ($(CONFIG_SPI_DRIVER),y)
   CSRCS += esp32s3_board_spidev.c
 endif
 
-ifeq ($(CONFIG_ESP32S3_WIFI),y)
+ifeq ($(CONFIG_ESPRESSIF_WIFI),y)
   CSRCS += esp32s3_board_wlan.c
 endif
 

boards/xtensa/esp32s3/common/src/esp32s3_board_wlan.c

@@ -36,7 +36,7 @@
 #include <nuttx/wireless/wireless.h>
 
 #include "esp32s3_spiflash.h"
-#include "esp32s3_wlan.h"
+#include "espressif/esp_wlan.h"
 
 /****************************************************************************
  * Public Functions
@@ -61,24 +61,23 @@ int board_wlan_init(void)
 {
   int ret = OK;
 
-#ifdef ESP32S3_WLAN_HAS_STA
+#ifdef ESPRESSIF_WLAN_HAS_STA
-  ret = esp32s3_wlan_sta_initialize();
+  ret = esp_wlan_sta_initialize();
   if (ret)
     {
       wlerr("ERROR: Failed to initialize Wi-Fi station\n");
       return ret;
     }
-#endif /* ESP32S3_WLAN_HAS_STA */
+#endif /* ESPRESSIF_WLAN_HAS_STA */
 
-#ifdef ESP32S3_WLAN_HAS_SOFTAP
+#ifdef ESPRESSIF_WLAN_HAS_SOFTAP
-  ret = esp32s3_wlan_softap_initialize();
+  ret = esp_wlan_softap_initialize();
   if (ret)
     {
       wlerr("ERROR: Failed to initialize Wi-Fi softAP\n");
       return ret;
     }
-#endif /* ESP32S3_WLAN_HAS_SOFTAP */
+#endif /* ESPRESSIF_WLAN_HAS_SOFTAP */
 
   return ret;
 }
-

boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c

@@ -42,15 +42,15 @@
 #  include "esp32s3_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 #  include "esp32s3_board_wlan.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
 #  include "esp32s3_ble.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
 #  include "esp32s3_wifi_adapter.h"
 #endif
 
@@ -193,9 +193,9 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   ret = esp32s3_wifi_bt_coexist_init();
   if (ret)
     {
@@ -203,7 +203,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
   ret = esp32s3_ble_initialize();
   if (ret)
     {
@@ -211,7 +211,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   ret = board_wlan_init();
   if (ret < 0)
     {

boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig

@@ -47,7 +47,7 @@ CONFIG_ESP32S3_I2S=y
 CONFIG_ESP32S3_SPIFLASH=y
 CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_PROCFS=y
 CONFIG_I2S_DMADESC_NUM=4

boards/xtensa/esp32s3/esp32s3-devkit/configs/ble/defconfig

@@ -28,9 +28,9 @@ CONFIG_DEFAULT_TASK_STACKSIZE=4096
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32S3_BLE=y
 CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_BLE=y
 CONFIG_FS_LARGEFILE=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072

boards/xtensa/esp32s3/esp32s3-devkit/configs/blewifi/defconfig

@@ -31,11 +31,11 @@ CONFIG_DEFAULT_TASK_STACKSIZE=4096
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32S3_BLE=y
 CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_BLE=y
-CONFIG_ESP32S3_WIFI_STATION_SOFTAP=y
+CONFIG_ESPRESSIF_WIFI=y
+CONFIG_ESPRESSIF_WIFI_STATION_SOFTAP=y
 CONFIG_EXAMPLES_DHCPD=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_LARGEFILE=y

boards/xtensa/esp32s3/esp32s3-devkit/configs/ksta_softap/defconfig

@@ -33,8 +33,8 @@ CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_STORAGE_MTD_OFFSET=0x200000
 CONFIG_ESP32S3_UART0=y
 CONFIG_ESP32S3_WCL=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
-CONFIG_ESP32S3_WIFI_STATION_SOFTAP=y
+CONFIG_ESPRESSIF_WIFI_STATION_SOFTAP=y
 CONFIG_EXAMPLES_DHCPD=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_PROCFS=y

boards/xtensa/esp32s3/esp32s3-devkit/configs/sta_softap/defconfig

@@ -31,8 +31,8 @@ CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32S3_SPIFLASH=y
 CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
-CONFIG_ESP32S3_WIFI_STATION_SOFTAP=y
+CONFIG_ESPRESSIF_WIFI_STATION_SOFTAP=y
 CONFIG_ESP_WPA_DEBUG_PRINT=y
 CONFIG_EXAMPLES_DHCPD=y
 CONFIG_EXAMPLES_RANDOM=y

boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig

@@ -31,7 +31,7 @@ CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
 CONFIG_ESP32S3_SPI_FLASH_SUPPORT_PSRAM_STACK=y
 CONFIG_ESP32S3_STORAGE_MTD_SIZE=0x1e80000
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_LARGEFILE=y
 CONFIG_FS_LITTLEFS=y

boards/xtensa/esp32s3/esp32s3-devkit/configs/wifi/defconfig

@@ -29,7 +29,7 @@ CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32S3_SPIFLASH=y
 CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072

boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c

@@ -44,15 +44,15 @@
 #  include "esp32s3_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 #  include "esp32s3_board_wlan.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
 #  include "esp32s3_ble.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
 #  include "esp32s3_wifi_adapter.h"
 #endif
 
@@ -429,17 +429,17 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
-  ret = esp32s3_wifi_bt_coexist_init();
+  ret = esp_wifi_bt_coexist_init();
   if (ret)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize Wi-Fi and BT coexist\n");
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
   ret = esp32s3_ble_initialize();
   if (ret)
     {
@@ -447,7 +447,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   ret = board_wlan_init();
   if (ret < 0)
     {

boards/xtensa/esp32s3/esp32s3-eye/configs/wifi/defconfig

@@ -29,7 +29,7 @@ CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32S3_SPIRAM=y
 CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
 CONFIG_ESP32S3_USBSERIAL=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072

boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c

@@ -42,15 +42,15 @@
 #  include "esp32s3_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 #  include "esp32s3_board_wlan.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
 #  include "esp32s3_ble.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
 #  include "esp32s3_wifi_adapter.h"
 #endif
 
@@ -184,9 +184,9 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   ret = esp32s3_wifi_bt_coexist_init();
   if (ret)
     {
@@ -194,7 +194,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
   ret = esp32s3_ble_initialize();
   if (ret)
     {
@@ -202,7 +202,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   ret = board_wlan_init();
   if (ret < 0)
     {

boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig

@@ -52,7 +52,7 @@ CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_SPIRAM=y
 CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y

boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig

@@ -53,7 +53,7 @@ CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_SPIRAM=y
 CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y

boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c

@@ -45,15 +45,15 @@
 #  include "esp32s3_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 #  include "esp32s3_board_wlan.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
 #  include "esp32s3_ble.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
 #  include "esp32s3_wifi_adapter.h"
 #endif
 
@@ -377,9 +377,9 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   ret = esp32s3_wifi_bt_coexist_init();
   if (ret)
     {
@@ -387,7 +387,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
   ret = esp32s3_ble_initialize();
   if (ret)
     {
@@ -395,7 +395,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   ret = board_wlan_init();
   if (ret < 0)
     {

boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig

@@ -50,7 +50,7 @@ CONFIG_ESP32S3_I2S=y
 CONFIG_ESP32S3_SPIFLASH=y
 CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
 CONFIG_ESP32S3_UART0=y
-CONFIG_ESP32S3_WIFI=y
+CONFIG_ESPRESSIF_WIFI=y
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y

boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c

@@ -45,15 +45,15 @@
 #  include "esp32s3_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
 #  include "esp32s3_board_wlan.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
 #  include "esp32s3_ble.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
 #  include "esp32s3_wifi_adapter.h"
 #endif
 
@@ -269,9 +269,9 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIRELESS
+#ifdef CONFIG_ESPRESSIF_WIRELESS
 
-#ifdef CONFIG_ESP32S3_WIFI_BT_COEXIST
+#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
   ret = esp32s3_wifi_bt_coexist_init();
   if (ret)
     {
@@ -279,7 +279,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_BLE
+#ifdef CONFIG_ESPRESSIF_BLE
   ret = esp32s3_ble_initialize();
   if (ret)
     {
@@ -287,7 +287,7 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_WIFI
+#ifdef CONFIG_ESPRESSIF_WIFI
   ret = board_wlan_init();
   if (ret < 0)
     {