Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 20:56:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

xtensa/esp32s3: use common Espressif wireless source

Browse 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.
This commit is contained in:
Filipe Cavalcanti
2025-01-16 15:07:41 -03:00
committed by Alin Jerpelea
parent 38c348bf9a
commit 954081cdd8
41 changed files with 279 additions and 5054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/xtensa/esp32s3/common/include/esp32s3_board_wlan.h
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+7 -8
View File
@@ -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
ret = esp32s3_wlan_sta_initialize();
#ifdef ESPRESSIF_WLAN_HAS_STA
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
ret = esp32s3_wlan_softap_initialize();
#ifdef ESPRESSIF_WLAN_HAS_SOFTAP
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
+7 -7
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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_ESP32S3_WIFI_STATION_SOFTAP=y
CONFIG_ESPRESSIF_BLE=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
+2 -2
View File
@@ -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_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_PROCFS=y
boards/xtensa/esp32s3/esp32s3-devkit/configs/sta_softap/defconfig
+2 -2
View File
@@ -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_ESP32S3_WIFI_STATION_SOFTAP=y
CONFIG_ESPRESSIF_WIFI=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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+8 -8
View File
@@ -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
ret = esp32s3_wifi_bt_coexist_init();
#ifdef CONFIG_ESPRESSIF_WIFI_BT_COEXIST
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
+1 -1
View File
@@ -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
+7 -7
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+7 -7
View File
@@ -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
+1 -1
View File
@@ -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
+7 -7
View File
@@ -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)
{