This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit c15521af912ba9db59f49484d93efc4bbdc8449f
Author: Filipe Cavalcanti <filipe.cavalca...@espressif.com>
AuthorDate: Thu Aug 21 16:10:31 2025 -0300
boards/risc-v: update board and defconfigs for Wi-Fi on ESP32-C3|C6
Updates the defconfigs and board source to support driver refactor.
Signed-off-by: Filipe Cavalcanti <filipe.cavalca...@espressif.com>
---
boards/risc-v/esp32c3/common/src/esp_board_wlan.c | 3 +--
.../esp32c3-generic/configs/mcuboot_update_agent/defconfig | 3 +++
.../esp32c3/esp32c3-generic/configs/sta_softap/defconfig | 4 +++-
.../risc-v/esp32c3/esp32c3-generic/configs/wifi/defconfig | 4 ++++
boards/risc-v/esp32c6/common/src/esp_board_wlan.c | 7 +++----
.../esp32c6-devkitc/configs/mcuboot_update_agent/defconfig | 3 +++
.../esp32c6/esp32c6-devkitc/configs/sta_softap/defconfig | 4 +++-
.../risc-v/esp32c6/esp32c6-devkitc/configs/wifi/defconfig | 13 +++++++------
.../esp32c6/esp32c6-devkitm/configs/sta_softap/defconfig | 3 +++
.../risc-v/esp32c6/esp32c6-devkitm/configs/wifi/defconfig | 3 +++
10 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/boards/risc-v/esp32c3/common/src/esp_board_wlan.c
b/boards/risc-v/esp32c3/common/src/esp_board_wlan.c
index e4a362b1dc..59e86da1d9 100644
--- a/boards/risc-v/esp32c3/common/src/esp_board_wlan.c
+++ b/boards/risc-v/esp32c3/common/src/esp_board_wlan.c
@@ -35,7 +35,7 @@
#include <nuttx/wireless/wireless.h>
-#include "espressif/esp_wlan.h"
+#include "espressif/esp_wlan_netdev.h"
/****************************************************************************
* Public Functions
@@ -80,4 +80,3 @@ int board_wlan_init(void)
return ret;
}
-
diff --git
a/boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_update_agent/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_update_agent/defconfig
index 77fc038e37..aa7fa48bb2 100644
---
a/boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_update_agent/defconfig
+++
b/boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_update_agent/defconfig
@@ -35,6 +35,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_BUFSIZE=128
+CONFIG_IOB_NBUFFERS=160
CONFIG_IOB_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -46,6 +48,7 @@ CONFIG_NETDEV_WORK_THREAD=y
CONFIG_NETUTILS_CJSON=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NET_BROADCAST=y
+CONFIG_NET_ETH_PKTSIZE=1514
CONFIG_NET_ICMP_SOCKET=y
CONFIG_NET_TCP=y
CONFIG_NET_TCP_DELAYED_ACK=y
diff --git a/boards/risc-v/esp32c3/esp32c3-generic/configs/sta_softap/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/sta_softap/defconfig
index 67a90ae1c6..fd26902ac7 100644
--- a/boards/risc-v/esp32c3/esp32c3-generic/configs/sta_softap/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/sta_softap/defconfig
@@ -34,7 +34,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
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_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -47,6 +48,7 @@ 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_TCP=y
CONFIG_NET_TCP_DELAYED_ACK=y
diff --git a/boards/risc-v/esp32c3/esp32c3-generic/configs/wifi/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/wifi/defconfig
index 93f4da648a..858f1b1803 100644
--- a/boards/risc-v/esp32c3/esp32c3-generic/configs/wifi/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/wifi/defconfig
@@ -31,6 +31,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_BUFSIZE=128
+CONFIG_IOB_NBUFFERS=160
CONFIG_IOB_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -40,7 +42,9 @@ 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
CONFIG_NET_TCP_DELAYED_ACK=y
diff --git a/boards/risc-v/esp32c6/common/src/esp_board_wlan.c
b/boards/risc-v/esp32c6/common/src/esp_board_wlan.c
index 827845b426..f3ad303b10 100644
--- a/boards/risc-v/esp32c6/common/src/esp_board_wlan.c
+++ b/boards/risc-v/esp32c6/common/src/esp_board_wlan.c
@@ -35,7 +35,7 @@
#include <nuttx/wireless/wireless.h>
-#include "espressif/esp_wlan.h"
+#include "espressif/esp_wlan_netdev.h"
/****************************************************************************
* Public Functions
@@ -64,7 +64,7 @@ int board_wlan_init(void)
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 /* ESP_WLAN_HAS_STA */
@@ -73,11 +73,10 @@ int board_wlan_init(void)
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 /* ESP_WLAN_HAS_SOFTAP */
return ret;
}
-
diff --git
a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/mcuboot_update_agent/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/mcuboot_update_agent/defconfig
index 1d8748e47d..c96b32712e 100644
---
a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/mcuboot_update_agent/defconfig
+++
b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/mcuboot_update_agent/defconfig
@@ -37,6 +37,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_BUFSIZE=128
+CONFIG_IOB_NBUFFERS=160
CONFIG_IOB_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -48,6 +50,7 @@ CONFIG_NETDEV_WORK_THREAD=y
CONFIG_NETUTILS_CJSON=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NET_BROADCAST=y
+CONFIG_NET_ETH_PKTSIZE=1514
CONFIG_NET_ICMP_SOCKET=y
CONFIG_NET_TCP=y
CONFIG_NET_TCP_DELAYED_ACK=y
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/sta_softap/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/sta_softap/defconfig
index b195f3e2e9..d3ca9db949 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/sta_softap/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/sta_softap/defconfig
@@ -36,7 +36,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
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_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -49,6 +50,7 @@ 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_TCP=y
CONFIG_NET_TCP_DELAYED_ACK=y
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/wifi/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/wifi/defconfig
index 8e93a02a6c..e19e931a24 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/wifi/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/wifi/defconfig
@@ -5,7 +5,6 @@
# You can then do "make savedefconfig" to generate a new defconfig file that
includes your
# modifications.
#
-# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ALLOW_BSD_COMPONENTS=y
@@ -19,6 +18,7 @@ CONFIG_ARCH_CHIP_ESP32C6WROOM1=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=15000
CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
@@ -27,12 +27,12 @@ CONFIG_ESPRESSIF_ESP32C6=y
CONFIG_ESPRESSIF_SPIFLASH=y
CONFIG_ESPRESSIF_SPIFLASH_SPIFFS=y
CONFIG_ESPRESSIF_WIFI=y
-CONFIG_EXAMPLES_RANDOM=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_BUFSIZE=128
+CONFIG_IOB_NBUFFERS=160
CONFIG_IOB_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -42,30 +42,31 @@ 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
CONFIG_NET_TCP_DELAYED_ACK=y
+CONFIG_NET_TCP_KEEPALIVE=y
CONFIG_NET_TCP_WRITE_BUFFERS=y
CONFIG_NET_UDP=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_DISABLE_DATE=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_READLINE=y
CONFIG_NSH_STRERROR=y
CONFIG_PREALLOC_TIMERS=0
CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_BACKTRACE=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
-CONFIG_SIG_DEFAULT=y
CONFIG_START_DAY=29
CONFIG_START_MONTH=11
CONFIG_START_YEAR=2019
CONFIG_SYSTEM_DHCPC_RENEW=y
-CONFIG_SYSTEM_DUMPSTACK=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TESTING_GETPRIME=y
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitm/configs/sta_softap/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkitm/configs/sta_softap/defconfig
index 10b6695ddf..4c22f55535 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitm/configs/sta_softap/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkitm/configs/sta_softap/defconfig
@@ -36,6 +36,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_BUFSIZE=128
+CONFIG_IOB_NBUFFERS=160
CONFIG_IOB_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -47,6 +49,7 @@ CONFIG_NETDEV_WORK_THREAD=y
CONFIG_NETUTILS_CJSON=y
CONFIG_NETUTILS_DHCPD=y
CONFIG_NET_BROADCAST=y
+CONFIG_NET_ETH_PKTSIZE=1514
CONFIG_NET_ICMP_SOCKET=y
CONFIG_NET_TCP=y
CONFIG_NET_TCP_DELAYED_ACK=y
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitm/configs/wifi/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkitm/configs/wifi/defconfig
index 10b6695ddf..4c22f55535 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitm/configs/wifi/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkitm/configs/wifi/defconfig
@@ -36,6 +36,8 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_BUFSIZE=128
+CONFIG_IOB_NBUFFERS=160
CONFIG_IOB_THROTTLE=24
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -47,6 +49,7 @@ CONFIG_NETDEV_WORK_THREAD=y
CONFIG_NETUTILS_CJSON=y
CONFIG_NETUTILS_DHCPD=y
CONFIG_NET_BROADCAST=y
+CONFIG_NET_ETH_PKTSIZE=1514
CONFIG_NET_ICMP_SOCKET=y
CONFIG_NET_TCP=y
CONFIG_NET_TCP_DELAYED_ACK=y
