This is an automated email from the ASF dual-hosted git repository. tmedicci pushed a commit to branch releases/12.11 in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit b49bf589c3aaa8e82b1e74fe04ac90e428500a8d Author: Filipe Cavalcanti <[email protected]> AuthorDate: Mon Sep 1 17:35:00 2025 -0300 boards/xtensa: update board and defconfigs for Wi-Fi on ESP32|S2|S3 Updates the defconfigs and board source to support driver refactor. Signed-off-by: Filipe Cavalcanti <[email protected]> --- arch/xtensa/src/common/espressif/Kconfig | 6 ++--- boards/xtensa/esp32/common/src/esp32_board_wlan.c | 25 +++++++-------------- .../esp32/esp32-2432S028/src/esp32_bringup.c | 4 ++-- .../esp32/esp32-audio-kit/configs/audio/defconfig | 6 ++++- .../esp32/esp32-audio-kit/configs/wifi/defconfig | 6 ++++- .../esp32/esp32-audio-kit/src/esp32_bringup.c | 4 ++-- .../esp32/esp32-devkitc/configs/audio/defconfig | 8 ++++--- .../esp32/esp32-devkitc/configs/autopm/defconfig | 5 +++++ .../esp32/esp32-devkitc/configs/blewifi/defconfig | 6 ++++- .../esp32/esp32-devkitc/configs/efuse/defconfig | 4 +++- .../configs/mcuboot_update_agent/defconfig | 6 ++++- .../esp32/esp32-devkitc/configs/mqttc/defconfig | 7 ++++-- .../esp32/esp32-devkitc/configs/nxlooper/defconfig | 8 ++++--- .../esp32/esp32-devkitc/configs/softap/defconfig | 4 ++++ .../esp32-devkitc/configs/sta_softap/defconfig | 21 ++++++++++------- .../configs/wamr_wasi_debug/defconfig | 9 +++++--- .../esp32/esp32-devkitc/configs/wifi/defconfig | 14 +++++++----- .../esp32/esp32-devkitc/configs/wifi_smp/defconfig | 7 ++++-- .../esp32/esp32-devkitc/configs/wifinsh/defconfig | 6 ++++- .../esp32-devkitc/configs/wifishare/defconfig | 6 ++++- .../xtensa/esp32/esp32-devkitc/src/esp32_bringup.c | 4 ++-- .../esp32-ethernet-kit/configs/autopm/defconfig | 5 +++++ .../esp32-ethernet-kit/configs/wifi/defconfig | 6 +++++ .../esp32/esp32-ethernet-kit/src/esp32_bringup.c | 4 ++-- .../esp32/esp32-lyrat/configs/audio/defconfig | 8 ++++--- .../esp32/esp32-lyrat/configs/rtptools/defconfig | 14 +++++++----- .../esp32/esp32-lyrat/configs/wifi/defconfig | 6 ++++- .../xtensa/esp32/esp32-lyrat/src/esp32_bringup.c | 4 ++-- .../esp32/esp32-pico-kit/src/esp32_bringup.c | 4 ++-- .../esp32-sparrow-kit/configs/mqttc/defconfig | 7 ++++-- .../esp32/esp32-sparrow-kit/configs/wifi/defconfig | 6 ++++- .../esp32/esp32-sparrow-kit/src/esp32_bringup.c | 4 ++-- .../esp32-wrover-kit/configs/autopm/defconfig | 5 +++++ .../esp32/esp32-wrover-kit/configs/wifi/defconfig | 5 +++++ .../esp32/esp32-wrover-kit/src/esp32_bringup.c | 4 ++-- .../lilygo_tbeam_lora_gps/src/esp32_bringup.c | 4 ++-- .../xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c | 4 ++-- .../esp32/ttgo_lora_esp32/src/esp32_bringup.c | 4 ++-- .../esp32/ttgo_t_display_esp32/src/esp32_bringup.c | 4 ++-- .../xtensa/esp32s2/common/src/esp32s2_board_wlan.c | 24 +++++++------------- .../configs/mcuboot_update_agent/defconfig | 4 +++- .../esp32s2-saola-1/configs/sta_softap/defconfig | 16 +++++-------- .../esp32s2/esp32s2-saola-1/configs/wifi/defconfig | 19 +++++++--------- .../esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c | 8 +++---- .../xtensa/esp32s3/common/src/esp32s3_board_wlan.c | 10 ++++----- .../esp32s3/esp32s3-devkit/configs/audio/defconfig | 9 +++++--- .../esp32s3/esp32s3-devkit/configs/ble/defconfig | 4 ++++ .../esp32s3-devkit/configs/blewifi/defconfig | 6 +++-- .../esp32s3-devkit/configs/fastboot/defconfig | 6 +++-- .../esp32s3-devkit/configs/fastboot_tcp/defconfig | 6 +++-- .../esp32s3-devkit/configs/ksta_softap/defconfig | 6 +++-- .../esp32s3-devkit/configs/mbedtls/defconfig | 6 +++-- .../configs/mcuboot_update_agent/defconfig | 6 +++-- .../esp32s3-devkit/configs/python/defconfig | 6 +++-- .../esp32s3-devkit/configs/qemu_debug/defconfig | 4 +++- .../esp32s3-devkit/configs/qemu_toywasm/defconfig | 4 +++- .../esp32s3-devkit/configs/sta_softap/defconfig | 26 ++++++++-------------- .../esp32s3-devkit/configs/toywasm/defconfig | 6 +++-- .../esp32s3/esp32s3-devkit/configs/wifi/defconfig | 24 ++++++++------------ .../esp32s3/esp32s3-devkit/src/esp32s3_bringup.c | 4 ++-- .../esp32s3/esp32s3-eye/configs/wifi/defconfig | 6 +++-- .../esp32s3-korvo-2/configs/audio/defconfig | 9 +++++--- .../esp32s3-korvo-2/configs/rtptools/defconfig | 9 +++++--- .../esp32s3/esp32s3-lcd-ev/configs/audio/defconfig | 9 +++++--- .../lckfb-szpi-esp32s3/configs/fastboot/defconfig | 4 +++- .../configs/fastboot_tcp/defconfig | 4 +++- 66 files changed, 303 insertions(+), 206 deletions(-) diff --git a/arch/xtensa/src/common/espressif/Kconfig b/arch/xtensa/src/common/espressif/Kconfig index c7bf0804ee3..4a22e83e1a9 100644 --- a/arch/xtensa/src/common/espressif/Kconfig +++ b/arch/xtensa/src/common/espressif/Kconfig @@ -1338,7 +1338,7 @@ config ESPRESSIF_WIFI_ENABLE_WPA3_OWE_STA choice ESPRESSIF_WIFI_MGMT_RX_BUFFER prompt "Type of WiFi RX MGMT buffers" default ESPRESSIF_WIFI_STATIC_RX_MGMT_BUFFER - help + ---help--- Select type of WiFi RX MGMT buffers: If "Static" is selected, WiFi RX MGMT buffers are allocated when WiFi is initialized and released @@ -1392,7 +1392,7 @@ config ESPRESSIF_WIFI_DYNAMIC_RX_BUFFER_NUM choice ESPRESSIF_WIFI_TX_BUFFER prompt "Type of WiFi TX buffers" default ESPRESSIF_WIFI_DYNAMIC_TX_BUFFER - help + ---help--- Select type of WiFi TX buffers: If "Static" is selected, WiFi TX buffers are allocated when WiFi is initialized and released @@ -1453,7 +1453,7 @@ config ESPRESSIF_WIFI_RX_MGMT_BUF_NUM_DEF int "Max number of WiFi RX MGMT buffers" range 1 10 default 5 - help + ---help--- Set the number of WiFi RX_MGMT buffers. For Management buffers, the number of dynamic and static management buffers is the same. diff --git a/boards/xtensa/esp32/common/src/esp32_board_wlan.c b/boards/xtensa/esp32/common/src/esp32_board_wlan.c index b020a6535f3..9d0180caa6f 100644 --- a/boards/xtensa/esp32/common/src/esp32_board_wlan.c +++ b/boards/xtensa/esp32/common/src/esp32_board_wlan.c @@ -25,18 +25,10 @@ ****************************************************************************/ #include <nuttx/config.h> - -#include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <sys/stat.h> +#include <sys/types.h> #include <syslog.h> -#include <debug.h> - -#include <nuttx/wireless/wireless.h> -#include "esp32_spiflash.h" -#include "espressif/esp_wlan.h" +#include "espressif/esp_wlan_netdev.h" /**************************************************************************** * Pre-processor Definitions @@ -66,24 +58,23 @@ int board_wlan_init(void) { int ret = OK; -#ifdef ESPRESSIF_WLAN_HAS_STA +#ifdef ESP_WLAN_HAS_STA ret = esp_wlan_sta_initialize(); if (ret) { - wlerr("ERROR: Failed to initialize Wi-Fi station\n"); + syslog(LOG_ERR, "ERROR: Failed to initialize Wi-Fi station\n"); return ret; } -#endif /* ESPRESSIF_WLAN_HAS_STA */ +#endif /* ESP_WLAN_HAS_STA */ -#ifdef ESPRESSIF_WLAN_HAS_SOFTAP +#ifdef ESP_WLAN_HAS_SOFTAP ret = esp_wlan_softap_initialize(); if (ret) { - wlerr("ERROR: Failed to initialize Wi-Fi softAP\n"); + syslog(LOG_ERR, "ERROR: Failed to initialize Wi-Fi softAP\n"); return ret; } -#endif /* ESPRESSIF_WLAN_HAS_SOFTAP */ +#endif /* ESP_WLAN_HAS_SOFTAP */ return ret; } - diff --git a/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c index 1e510f044a1..92c35370d76 100644 --- a/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c @@ -59,7 +59,7 @@ # include "esp32_board_spiflash.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -187,7 +187,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig b/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig index 6c5b8b9d827..99bc7ebd535 100644 --- a/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig +++ b/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig @@ -66,6 +66,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -78,7 +82,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-audio-kit/configs/wifi/defconfig b/boards/xtensa/esp32/esp32-audio-kit/configs/wifi/defconfig index 88b0cf6fed4..faa34e0f0aa 100644 --- a/boards/xtensa/esp32/esp32-audio-kit/configs/wifi/defconfig +++ b/boards/xtensa/esp32/esp32-audio-kit/configs/wifi/defconfig @@ -39,6 +39,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -51,7 +55,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c index 50b11c22bb8..076d08c014a 100644 --- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c @@ -68,7 +68,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -217,7 +217,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig index b1bfdbdc562..77955464b52 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig @@ -65,8 +65,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=24 -CONFIG_IOB_THROTTLE=0 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -79,7 +81,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig index bfcfacce45f..f567f4bc105 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig @@ -35,6 +35,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -45,6 +49,7 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETINIT_DHCPC=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig index 63b647ea5b5..a57b3dbef33 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig @@ -47,6 +47,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -61,7 +65,7 @@ CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BLUETOOTH=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/efuse/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/efuse/defconfig index 04e1038a606..8360145d543 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/efuse/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/efuse/defconfig @@ -28,8 +28,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_LINE_MAX=64 +CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 +CONFIG_NAME_MAX=48 +CONFIG_NETUTILS_CJSON=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig index 117d6d05591..783477f3448 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig @@ -40,6 +40,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=4 CONFIG_NAME_MAX=48 @@ -53,7 +57,7 @@ CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig index 20d228cd323..71e17b6a69f 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig @@ -35,8 +35,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=24 -CONFIG_IOB_THROTTLE=0 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -48,6 +50,7 @@ CONFIG_NETINIT_DHCPC=y CONFIG_NETINIT_DRIPADDR=0xc0a80101 CONFIG_NETUTILS_MQTTC=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_TCP_NOTIFIER=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig index 6d29359697b..e4928b8f325 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig @@ -66,8 +66,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=24 -CONFIG_IOB_THROTTLE=0 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -80,7 +82,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig index a6843eebe74..1e9f1b5e1fe 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig @@ -39,6 +39,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig index bc64df1d57f..23bb838bb03 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig @@ -20,9 +20,10 @@ CONFIG_ARCH_CHIP_ESP32WROVER=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y -CONFIG_BOARDCTL_RESET=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y +CONFIG_DEFAULT_TASK_STACKSIZE=4096 +CONFIG_DEV_URANDOM=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y CONFIG_ESP32_SPIFLASH=y @@ -32,35 +33,40 @@ CONFIG_ESP32_UART0=y CONFIG_ESPRESSIF_WIFI=y CONFIG_ESPRESSIF_WIFI_STATION_SOFTAP=y CONFIG_EXAMPLES_DHCPD=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=128 -CONFIG_IOB_THROTTLE=24 -CONFIG_LINE_MAX=64 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 +CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=4 +CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_NAMESIZE=64 CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETDEV_WORK_THREAD=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_IPERF=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_TCP=y +CONFIG_NET_TCP_DELAYED_ACK=y CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y +CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 @@ -85,4 +91,3 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y CONFIG_WIRELESS_WAPI_INITCONF=y -CONFIG_WIRELESS_WAPI_STACKSIZE=4096 diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wamr_wasi_debug/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wamr_wasi_debug/defconfig index 3ad69fea284..b5706e9e440 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wamr_wasi_debug/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wamr_wasi_debug/defconfig @@ -62,8 +62,10 @@ CONFIG_INTERPRETERS_WAMR_LOG=y CONFIG_INTERPRETERS_WAMR_SHARED_MEMORY=y CONFIG_INTERPRETERS_WAMR_THREAD_MGR=y CONFIG_INTERPRETERS_WAMR_VERSION="0ba65326366d6675dcb4fe42a3dc6c8e00703165" -CONFIG_IOB_NBUFFERS=24 -CONFIG_IOB_THROTTLE=0 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LIBC_DLFCN=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y @@ -73,7 +75,7 @@ CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_GUARDSIZE=32 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PKT=y @@ -95,6 +97,7 @@ CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKSTACKSIZE=2048 +CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SERIAL_NPOLLWAITERS=2 CONFIG_SIG_DEFAULT=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifi/defconfig index 3baeffb2bf5..da3d138efdd 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifi/defconfig @@ -36,22 +36,25 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 -CONFIG_MM_REGIONS=3 +CONFIG_MM_REGIONS=4 CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_NAMESIZE=64 CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETDEV_WORK_THREAD=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y -CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 -CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_DELAYED_ACK=y CONFIG_NET_TCP_WRITE_BUFFERS=y @@ -69,7 +72,8 @@ CONFIG_RR_INTERVAL=200 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SIG_DEFAULT=y -CONFIG_SPI=y +CONFIG_SMP=y +CONFIG_SMP_NCPUS=2 CONFIG_SPIFFS_NAME_MAX=48 CONFIG_START_DAY=6 CONFIG_START_MONTH=12 diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifi_smp/defconfig index 8fafbbbb53f..ec0ea0ad86f 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifi_smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifi_smp/defconfig @@ -44,7 +44,10 @@ CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=128 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=4 CONFIG_NAME_MAX=48 @@ -63,7 +66,7 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NETUTILS_WEBSERVER=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig index be43ac0b82b..42b65347eab 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig @@ -35,6 +35,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -50,7 +54,7 @@ CONFIG_NETINIT_WAPI_SSID="YOUR_ROUTER_NAME" CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_TCP_DELAYED_ACK=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifishare/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifishare/defconfig index dae5c4e73b0..c56e1d40d05 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifishare/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifishare/defconfig @@ -39,6 +39,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -55,7 +59,7 @@ CONFIG_NETUTILS_DHCPC_BOOTP_FLAGS=0x0000 CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_IPFORWARD=y CONFIG_NET_IPFORWARD_BROADCAST=y diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c index 92513073755..1ba046fcab8 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c @@ -74,7 +74,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -369,7 +369,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig index e0ebd29234a..e4f59d4871b 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig @@ -34,6 +34,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -44,6 +48,7 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETINIT_DHCPC=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wifi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wifi/defconfig index e46947fc250..7948f6795b9 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wifi/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wifi/defconfig @@ -33,6 +33,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -41,7 +45,9 @@ CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_CJSON=y +CONFIG_NETUTILS_IPERF=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c index 96511de3958..9b5352a5c1d 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c @@ -67,7 +67,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -178,7 +178,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig b/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig index 2c7536016ef..7ad325f58a8 100644 --- a/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig +++ b/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig @@ -65,8 +65,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=24 -CONFIG_IOB_THROTTLE=0 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -79,7 +81,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig b/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig index 9bb1566c064..824f1fd2ff8 100644 --- a/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig +++ b/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig @@ -50,9 +50,9 @@ CONFIG_ESPRESSIF_I2S0_DOUTPIN=26 CONFIG_ESPRESSIF_I2S0_MCLK=y CONFIG_ESPRESSIF_I2S0_WSPIN=25 CONFIG_ESPRESSIF_WIFI=y -CONFIG_ESPRESSIF_WIFI_DYNAMIC_RXBUF_NUM=64 -CONFIG_ESPRESSIF_WIFI_DYNAMIC_TXBUF_NUM=64 -CONFIG_ESPRESSIF_WIFI_STATIC_RXBUF_NUM=16 +CONFIG_ESPRESSIF_WIFI_DYNAMIC_RX_BUFFER_NUM=64 +CONFIG_ESPRESSIF_WIFI_DYNAMIC_TX_BUFFER_NUM=64 +CONFIG_ESPRESSIF_WIFI_STATIC_RX_BUFFER_NUM=16 CONFIG_EXAMPLES_I2SCHAR=y CONFIG_EXAMPLES_I2SCHAR_TX=y CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS=2 @@ -69,8 +69,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=256 -CONFIG_IOB_THROTTLE=72 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=4 CONFIG_MTD=y @@ -86,7 +88,7 @@ CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_RTPTOOLS=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/wifi/defconfig b/boards/xtensa/esp32/esp32-lyrat/configs/wifi/defconfig index 80aca906a9c..1ec8df53457 100644 --- a/boards/xtensa/esp32/esp32-lyrat/configs/wifi/defconfig +++ b/boards/xtensa/esp32/esp32-lyrat/configs/wifi/defconfig @@ -39,6 +39,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=300 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -51,7 +55,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c index 42e3bee9990..14090a48d28 100644 --- a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c @@ -68,7 +68,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -218,7 +218,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c index 9e30465aec3..cc6a3e6c896 100644 --- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c @@ -67,7 +67,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -245,7 +245,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig index 6a3da6eeab4..8167d06a1bf 100644 --- a/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig +++ b/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig @@ -68,8 +68,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=24 -CONFIG_IOB_THROTTLE=0 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LCD=y CONFIG_LCD_DEV=y CONFIG_LCD_FRAMEBUFFER=y @@ -89,6 +91,7 @@ CONFIG_NETINIT_DHCPC=y CONFIG_NETINIT_DRIPADDR=0xc0a80101 CONFIG_NETUTILS_MQTTC=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_TCP_NOTIFIER=y diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig b/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig index 0bac39bb3d6..43c7c2d49c7 100644 --- a/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig +++ b/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig @@ -68,6 +68,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=16 +CONFIG_IOB_THROTTLE=24 CONFIG_LCD=y CONFIG_LCD_DEV=y CONFIG_LCD_FRAMEBUFFER=y @@ -88,7 +92,7 @@ CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_PREALLOC_DEVIF_CALLBACKS=32 CONFIG_NET_STATISTICS=y diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c index 593ba16795b..318f9208ac8 100644 --- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c @@ -71,7 +71,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -229,7 +229,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig index 51ed5b9e175..123fddff86d 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig @@ -35,6 +35,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -45,6 +49,7 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETINIT_DHCPC=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wifi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wifi/defconfig index 186c1571557..015d856ea6a 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wifi/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wifi/defconfig @@ -34,6 +34,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -43,6 +47,7 @@ CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c index 65d84ec9b47..e285ed5af9b 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c @@ -67,7 +67,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -217,7 +217,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c index 8b6539e9a2e..8309cee1c44 100644 --- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c +++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c @@ -75,7 +75,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -218,7 +218,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c index 1fe258a9858..98400f1cb78 100644 --- a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c +++ b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c @@ -79,7 +79,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -295,7 +295,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c index a220104c9d5..34509662c32 100644 --- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c +++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c @@ -75,7 +75,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -218,7 +218,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c index 67dbd5e2eb4..ac5c314793f 100644 --- a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c +++ b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c @@ -75,7 +75,7 @@ # include "esp32_ble.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32_board_wlan.h" #endif @@ -298,7 +298,7 @@ int esp32_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32s2/common/src/esp32s2_board_wlan.c b/boards/xtensa/esp32s2/common/src/esp32s2_board_wlan.c index 3fb9b5e4445..3b15a38f312 100644 --- a/boards/xtensa/esp32s2/common/src/esp32s2_board_wlan.c +++ b/boards/xtensa/esp32s2/common/src/esp32s2_board_wlan.c @@ -24,18 +24,10 @@ * Included Files ****************************************************************************/ -#include <nuttx/config.h> - -#include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <sys/stat.h> +#include <sys/types.h> #include <syslog.h> -#include <debug.h> - -#include <nuttx/wireless/wireless.h> -#include "espressif/esp_wlan.h" +#include "espressif/esp_wlan_netdev.h" /**************************************************************************** * Public Functions @@ -60,23 +52,23 @@ int board_wlan_init(void) { int ret = OK; -#ifdef ESPRESSIF_WLAN_HAS_STA +#ifdef ESP_WLAN_HAS_STA ret = esp_wlan_sta_initialize(); if (ret) { - wlerr("ERROR: Failed to initialize Wi-Fi station\n"); + syslog(LOG_ERR, "ERROR: Failed to initialize Wi-Fi station\n"); return ret; } -#endif /* ESPRESSIF_WLAN_HAS_STA */ +#endif /* ESP_WLAN_HAS_STA */ -#ifdef ESPRESSIF_WLAN_HAS_SOFTAP +#ifdef ESP_WLAN_HAS_SOFTAP ret = esp_wlan_softap_initialize(); if (ret) { - wlerr("ERROR: Failed to initialize Wi-Fi softAP\n"); + syslog(LOG_ERR, "ERROR: Failed to initialize Wi-Fi softAP\n"); return ret; } -#endif /* ESPRESSIF_WLAN_HAS_SOFTAP */ +#endif /* ESP_WLAN_HAS_SOFTAP */ return ret; } diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_update_agent/defconfig index 203fea28b58..71e49b4a490 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_update_agent/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_update_agent/defconfig @@ -38,7 +38,9 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=36 CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48 diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/sta_softap/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/sta_softap/defconfig index 1043ce95e07..8227c51e4eb 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/sta_softap/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/sta_softap/defconfig @@ -20,10 +20,8 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32S2_RT_TIMER_TASK_STACK_SIZE=4096 CONFIG_ESP32S2_SPIFLASH_SPIFFS=y CONFIG_ESP32S2_UART0=y CONFIG_ESPRESSIF_SPIFLASH=y @@ -35,16 +33,18 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INIT_STACKSIZE=8192 +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 -CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETDEV_WORK_THREAD=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_IPERF=y @@ -60,7 +60,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 @@ -68,7 +67,6 @@ CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y -CONFIG_SIG_DEFAULT=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 @@ -76,11 +74,9 @@ CONFIG_SYSLOG_BUFFER=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_TIMER=y CONFIG_TLS_TASK_NELEM=4 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y CONFIG_WIRELESS_WAPI_INITCONF=y -CONFIG_WIRELESS_WAPI_STACKSIZE=8192 diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/wifi/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/wifi/defconfig index 617f58c2d90..7624f71a4bf 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/wifi/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/wifi/defconfig @@ -20,30 +20,31 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32S2_RT_TIMER_TASK_STACK_SIZE=4096 +CONFIG_ESP32S2_SPIFLASH_SPIFFS=y CONFIG_ESP32S2_UART0=y +CONFIG_ESPRESSIF_SPIFLASH=y CONFIG_ESPRESSIF_WIFI=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INIT_STACKSIZE=8192 +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 -CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETDEV_WORK_THREAD=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y -CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y @@ -55,7 +56,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 @@ -63,7 +63,6 @@ CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y -CONFIG_SIG_DEFAULT=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 @@ -71,11 +70,9 @@ CONFIG_SYSLOG_BUFFER=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_TIMER=y CONFIG_TLS_TASK_NELEM=4 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y CONFIG_WIRELESS_WAPI_INITCONF=y -CONFIG_WIRELESS_WAPI_STACKSIZE=8192 diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c index f291ee3e2bb..8044ec8bbfc 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c @@ -50,7 +50,7 @@ # include "esp32s2_tim_lowerhalf.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32s2_board_wlan.h" #endif @@ -341,16 +341,14 @@ int esp32s2_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WIRELESS +#ifdef CONFIG_ESPRESSIF_WIFI -#ifdef CONFIG_ESPRESSIF_WLAN ret = board_wlan_init(); if (ret < 0) { syslog(LOG_ERR, "ERROR: Failed to initialize wlan subsystem=%d\n", - ret); + ret); } -#endif #endif diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_board_wlan.c b/boards/xtensa/esp32s3/common/src/esp32s3_board_wlan.c index 5c5b6770fc2..004587e564d 100644 --- a/boards/xtensa/esp32s3/common/src/esp32s3_board_wlan.c +++ b/boards/xtensa/esp32s3/common/src/esp32s3_board_wlan.c @@ -36,7 +36,7 @@ #include <nuttx/wireless/wireless.h> #include "esp32s3_spiflash.h" -#include "espressif/esp_wlan.h" +#include "espressif/esp_wlan_netdev.h" /**************************************************************************** * Public Functions @@ -61,23 +61,23 @@ int board_wlan_init(void) { int ret = OK; -#ifdef ESPRESSIF_WLAN_HAS_STA +#ifdef ESP_WLAN_HAS_STA ret = esp_wlan_sta_initialize(); if (ret) { wlerr("ERROR: Failed to initialize Wi-Fi station\n"); return ret; } -#endif /* ESPRESSIF_WLAN_HAS_STA */ +#endif /* ESP_WLAN_HAS_STA */ -#ifdef ESPRESSIF_WLAN_HAS_SOFTAP +#ifdef ESP_WLAN_HAS_SOFTAP ret = esp_wlan_softap_initialize(); if (ret) { wlerr("ERROR: Failed to initialize Wi-Fi softAP\n"); return ret; } -#endif /* ESPRESSIF_WLAN_HAS_SOFTAP */ +#endif /* ESP_WLAN_HAS_SOFTAP */ return ret; } diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig index b63b94b9136..8c37eb9f965 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig @@ -54,8 +54,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y @@ -63,7 +65,7 @@ CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -82,6 +84,7 @@ CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SMP=y CONFIG_SMP_NCPUS=2 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/ble/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/ble/defconfig index b821ddd3792..5d408ddd241 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/ble/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/ble/defconfig @@ -37,6 +37,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=36 +CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48 CONFIG_NETDEV_LATEINIT=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/blewifi/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/blewifi/defconfig index e72013446f5..c1a2453890a 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/blewifi/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/blewifi/defconfig @@ -44,8 +44,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MTD=y CONFIG_MTD_BYTE_WRITE=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot/defconfig index 1d03cfc5bd1..06788255d48 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot/defconfig @@ -45,8 +45,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot_tcp/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot_tcp/defconfig index 449bee75ecb..63f02065f53 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot_tcp/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/fastboot_tcp/defconfig @@ -38,8 +38,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/ksta_softap/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/ksta_softap/defconfig index 8a0ea03229a..a56ed4cd6d4 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/ksta_softap/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/ksta_softap/defconfig @@ -42,8 +42,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig index 8e228daff1d..ae465874992 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig @@ -46,8 +46,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LIBC_RAND_ORDER=2 CONFIG_LINE_MAX=255 CONFIG_MBEDTLS_APPS=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_update_agent/defconfig index 27c99686b27..470bbda720e 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_update_agent/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_update_agent/defconfig @@ -43,8 +43,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig index e1b80c7578f..38b3023befe 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig @@ -52,8 +52,10 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_INTERPRETER_CPYTHON=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LIBC_ELF_HAVE_SYMTAB=y CONFIG_LIBC_ELF_SYSTEM_SYMTAB=y CONFIG_LIBC_EXECFUNCS=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig index 399fe8a6853..0e8a7bc5e08 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig @@ -44,7 +44,9 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=36 CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=255 CONFIG_MM_REGIONS=2 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig index 74aac80b8d0..2515d54c21a 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig @@ -45,7 +45,9 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_INTERPRETERS_TOYWASM=y -CONFIG_IOB_NBUFFERS=124 +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=36 CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=255 CONFIG_MM_REGIONS=2 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/sta_softap/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/sta_softap/defconfig index e362fbcc5ec..f26acef5985 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/sta_softap/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/sta_softap/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -# CONFIG_NDEBUG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ALLOW_BSD_COMPONENTS=y @@ -20,35 +19,33 @@ CONFIG_ARCH_CHIP_ESP32S3WROOM1N4=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y -CONFIG_BOARDCTL_RESET=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32S3_MERGE_BINS=y -CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096 CONFIG_ESP32S3_SPIFLASH=y CONFIG_ESP32S3_SPIFLASH_SPIFFS=y CONFIG_ESP32S3_UART0=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 CONFIG_FS_PROCFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INIT_STACKSIZE=8192 +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 -CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETDEV_WORK_THREAD=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_IPERF=y @@ -64,7 +61,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 @@ -72,10 +68,6 @@ CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y -CONFIG_SIG_DEFAULT=y -CONFIG_SMP=y -CONFIG_SMP_NCPUS=2 -CONFIG_SPIFFS_NAME_MAX=128 CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 @@ -90,4 +82,4 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y CONFIG_WIRELESS_WAPI_INITCONF=y -CONFIG_WIRELESS_WAPI_STACKSIZE=8192 +CONFIG_WIRELESS_WAPI_STACKSIZE=4096 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig index 88650e1dd06..39aa61fb5e9 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig @@ -44,8 +44,10 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_INTERPRETERS_TOYWASM=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=255 CONFIG_MM_REGIONS=2 CONFIG_NAME_MAX=48 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/wifi/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/wifi/defconfig index 8d2a790dfa7..2db79fdcfcb 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/wifi/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/wifi/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -# CONFIG_NDEBUG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ALLOW_BSD_COMPONENTS=y @@ -22,31 +21,31 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096 CONFIG_ESP32S3_SPIFLASH=y CONFIG_ESP32S3_SPIFLASH_SPIFFS=y CONFIG_ESP32S3_UART0=y CONFIG_ESPRESSIF_WIFI=y -CONFIG_EXAMPLES_RANDOM=y CONFIG_FS_PROCFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INIT_STACKSIZE=8192 +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 -CONFIG_NAME_MAX=48 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETDEV_WORK_THREAD=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_IPERF=y -CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y @@ -58,7 +57,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 @@ -66,10 +64,6 @@ CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y -CONFIG_SIG_DEFAULT=y -CONFIG_SMP=y -CONFIG_SMP_NCPUS=2 -CONFIG_SPIFFS_NAME_MAX=128 CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 @@ -84,4 +78,4 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y CONFIG_WIRELESS_WAPI_INITCONF=y -CONFIG_WIRELESS_WAPI_STACKSIZE=8192 +CONFIG_WIRELESS_WAPI_STACKSIZE=4096 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c index 8d73ed869b4..c01d7e1baf6 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c @@ -44,7 +44,7 @@ # include "esp32s3_board_tim.h" #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI # include "esp32s3_board_wlan.h" #endif @@ -492,7 +492,7 @@ int esp32s3_bringup(void) } #endif -#ifdef CONFIG_ESPRESSIF_WLAN +#ifdef CONFIG_ESPRESSIF_WIFI ret = board_wlan_init(); if (ret < 0) { diff --git a/boards/xtensa/esp32s3/esp32s3-eye/configs/wifi/defconfig b/boards/xtensa/esp32s3/esp32s3-eye/configs/wifi/defconfig index e01041fd13e..3bf1ab869a2 100644 --- a/boards/xtensa/esp32s3/esp32s3-eye/configs/wifi/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-eye/configs/wifi/defconfig @@ -36,8 +36,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=2 CONFIG_NAME_MAX=48 diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig index 1344700e4c5..95caab3e8f0 100644 --- a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig @@ -60,8 +60,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=4096 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=2 CONFIG_NAME_MAX=48 @@ -71,7 +73,7 @@ CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -92,6 +94,7 @@ CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SMP=y CONFIG_SMP_NCPUS=2 diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig index 00ca96559bc..80c08569d8c 100644 --- a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig @@ -61,8 +61,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=4096 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=2 CONFIG_NAME_MAX=48 @@ -73,7 +75,7 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_CJSON=y CONFIG_NETUTILS_RTPTOOLS=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -94,6 +96,7 @@ CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SMP=y CONFIG_SMP_NCPUS=2 diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig b/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig index cc4a261477b..45d15197b67 100644 --- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig @@ -57,8 +57,10 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 -CONFIG_IOB_THROTTLE=24 +CONFIG_IOB_BUFSIZE=400 +CONFIG_IOB_NBUFFERS=100 +CONFIG_IOB_NCHAINS=32 +CONFIG_IOB_THROTTLE=40 CONFIG_LINE_MAX=64 CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDEV_LATEINIT=y @@ -66,7 +68,7 @@ CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_CJSON=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=1518 +CONFIG_NET_ETH_PKTSIZE=1514 CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -85,6 +87,7 @@ CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_LPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SMP=y CONFIG_SMP_NCPUS=2 diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot/defconfig b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot/defconfig index 7af0b85ceee..ba4a2e11630 100644 --- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot/defconfig +++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot/defconfig @@ -45,7 +45,9 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=36 CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48 diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot_tcp/defconfig b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot_tcp/defconfig index 6b9519bc305..10c2122fb6c 100644 --- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot_tcp/defconfig +++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/configs/fastboot_tcp/defconfig @@ -36,7 +36,9 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_NBUFFERS=124 +CONFIG_IOB_BUFSIZE=128 +CONFIG_IOB_NBUFFERS=160 +CONFIG_IOB_NCHAINS=36 CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=64 CONFIG_NAME_MAX=48
