Skip to content

Commit 4385aa4

Browse files
MaochenWang1kartben
authored andcommitted
samples: net: wifi: shell: split rw612 conf file
Keep the minimum configurations in frdm_rw612.conf and rd_rw612_bga.conf for basic STA functionality of embedded supplicant case. Add the superset configurations in nxp/overlay_rw612.conf. Add the supplicant support in nxp/overlay_hostap_rw612.conf. Add the basic debug support in nxp/overlay_rw612_debug.conf. Add the supplicant debug support in nxp/overlay_hostap_rw612_debug.conf. Signed-off-by: Maochen Wang <[email protected]>
1 parent 293f51f commit 4385aa4

File tree

6 files changed

+135
-232
lines changed

6 files changed

+135
-232
lines changed
Lines changed: 1 addition & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,11 @@
11
CONFIG_WIFI_NXP=y
22
CONFIG_NXP_RW610=y
3-
CONFIG_NXP_WIFI_SHELL=y
4-
5-
#
6-
# C Library
7-
#
8-
CONFIG_REQUIRES_FULL_LIBC=y
9-
CONFIG_CBPRINTF_FP_SUPPORT=y
10-
11-
# log
12-
CONFIG_WIFI_LOG_LEVEL_DBG=y
13-
CONFIG_THREAD_LOCAL_STORAGE=y
14-
CONFIG_ASSERT=y
15-
CONFIG_ASSERT_LEVEL=2
16-
CONFIG_LOG_MODE_IMMEDIATE=y
17-
CONFIG_LOG_PRINTK=n
18-
19-
# os
20-
CONFIG_THREAD_CUSTOM_DATA=y
21-
CONFIG_EVENTS=y
22-
CONFIG_SYS_HEAP_AUTO=y
23-
CONFIG_SCHED_MULTIQ=y
24-
CONFIG_ZVFS_OPEN_MAX=30
25-
26-
# shell
27-
CONFIG_SHELL_ARGC_MAX=48
28-
CONFIG_WIFI_SHELL_MAX_AP_STA=8
29-
CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=8
30-
CONFIG_SHELL_CMD_BUFF_SIZE=512
31-
32-
# net
33-
CONFIG_NET_L2_ETHERNET=y
34-
CONFIG_NET_IPV4=y
35-
CONFIG_NET_IPV6=y
36-
CONFIG_NET_ZPERF=y
37-
CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500
38-
CONFIG_NET_BUF_LOG=y
39-
CONFIG_NET_PKT_RX_COUNT=36
40-
CONFIG_NET_PKT_TX_COUNT=36
41-
CONFIG_NET_BUF_RX_COUNT=40
42-
CONFIG_NET_BUF_TX_COUNT=40
43-
CONFIG_NET_BUF_DATA_SIZE=1744
44-
CONFIG_NET_TCP_MAX_SEND_WINDOW_SIZE=46720
45-
CONFIG_NET_TCP_MAX_RECV_WINDOW_SIZE=46720
46-
CONFIG_NET_TC_TX_COUNT=1
47-
CONFIG_NET_TC_RX_COUNT=1
48-
CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=20
49-
CONFIG_NET_IF_MAX_IPV4_COUNT=2
50-
CONFIG_NET_IF_MAX_IPV6_COUNT=2
51-
CONFIG_DNS_RESOLVER=y
52-
CONFIG_DNS_RESOLVER_MAX_SERVERS=2
53-
CONFIG_NET_SOCKETS_POLL_MAX=14
54-
CONFIG_NET_ZPERF_MAX_SESSIONS=6
55-
CONFIG_NET_IPV4_FRAGMENT=y
56-
CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=3
57-
CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=7
58-
CONFIG_NET_IPV4_FRAGMENT_TIMEOUT=3
59-
CONFIG_NET_IPV6_FRAGMENT=y
60-
CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3
61-
CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8
62-
CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3
63-
CONFIG_NET_MAX_CONN=10
643
CONFIG_ETH_DRIVER=n
654

66-
# net threads priority
67-
CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y
68-
CONFIG_NET_TC_THREAD_PREEMPTIVE=y
69-
CONFIG_NET_TCP_WORKER_PRIO=-16
70-
CONFIG_NET_TC_TX_THREAD_BASE_PRIO=3
71-
CONFIG_NET_TC_RX_THREAD_BASE_PRIO=3
72-
CONFIG_ZPERF_WORK_Q_THREAD_PRIORITY=3
73-
CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=3
74-
CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO=y
75-
CONFIG_NET_CONTEXT_PRIORITY=y
76-
CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
77-
CONFIG_NET_MGMT_THREAD_PRIORITY=3
78-
79-
# power management
80-
CONFIG_PM=y
81-
CONFIG_PM_DEVICE=y
82-
CONFIG_PM_LOG_LEVEL_OFF=y
83-
CONFIG_PM_DEVICE_LOG_LEVEL_OFF=y
84-
CONFIG_IDLE_STACK_SIZE=1024
85-
865
# stack size
876
CONFIG_SHELL_STACK_SIZE=6144
887
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
898
CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
909
CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
9110
CONFIG_MAIN_STACK_SIZE=4096
92-
CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
93-
94-
# optimization level
95-
# refer to Kconfig.zephyr for Optimizations Level
96-
CONFIG_SPEED_OPTIMIZATIONS=y
97-
#CONFIG_SIZE_OPTIMIZATIONS=y
98-
#CONFIG_DEBUG_OPTIMIZATIONS=y
99-
#CONFIG_NO_OPTIMIZATIONS=y
100-
101-
# debug & stats
102-
CONFIG_SYS_HEAP_VALIDATE=y
103-
CONFIG_SYS_HEAP_RUNTIME_STATS=y
104-
#CONFIG_NET_PKT_TXTIME_STATS=y
105-
#CONFIG_NET_PKT_TXTIME_STATS_DETAIL=y
106-
CONFIG_NET_STATISTICS_WIFI=y
107-
CONFIG_NET_STATISTICS_USER_API=y
108-
#CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=y
109-
#CONFIG_NET_BUF_POOL_USAGE=y
110-
#CONFIG_NET_DEBUG_NET_PKT_ALLOC=y
111-
112-
# stack size for -O0
113-
#CONFIG_SHELL_STACK_SIZE=8192
114-
#CONFIG_NET_TCP_WORKQ_STACK_SIZE=4096
115-
#CONFIG_NET_TX_STACK_SIZE=4096
116-
#CONFIG_NET_RX_STACK_SIZE=4096
117-
#CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
118-
#CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
119-
#CONFIG_MAIN_STACK_SIZE=4096
120-
#CONFIG_IDLE_STACK_SIZE=2048
121-
122-
# comment out for -O0
123-
CONFIG_CODE_DATA_RELOCATION_SRAM=y
11+
CONFIG_IDLE_STACK_SIZE=1024
Lines changed: 1 addition & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,10 @@
11
CONFIG_WIFI_NXP=y
22
CONFIG_NXP_RW610=y
3-
CONFIG_NXP_WIFI_SHELL=y
4-
5-
#
6-
# C Library
7-
#
8-
CONFIG_REQUIRES_FULL_LIBC=y
9-
CONFIG_CBPRINTF_FP_SUPPORT=y
10-
11-
# log
12-
CONFIG_WIFI_LOG_LEVEL_DBG=y
13-
CONFIG_THREAD_LOCAL_STORAGE=y
14-
CONFIG_ASSERT=y
15-
CONFIG_ASSERT_LEVEL=2
16-
CONFIG_LOG_MODE_IMMEDIATE=y
17-
CONFIG_LOG_PRINTK=n
18-
19-
# os
20-
CONFIG_THREAD_CUSTOM_DATA=y
21-
CONFIG_EVENTS=y
22-
CONFIG_SYS_HEAP_AUTO=y
23-
CONFIG_SCHED_MULTIQ=y
24-
CONFIG_ZVFS_OPEN_MAX=30
25-
26-
# shell
27-
CONFIG_SHELL_ARGC_MAX=48
28-
CONFIG_WIFI_SHELL_MAX_AP_STA=8
29-
CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=8
30-
CONFIG_SHELL_CMD_BUFF_SIZE=512
31-
32-
# net
33-
CONFIG_NET_L2_ETHERNET=y
34-
CONFIG_NET_IPV4=y
35-
CONFIG_NET_IPV6=y
36-
CONFIG_NET_ZPERF=y
37-
CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500
38-
CONFIG_NET_BUF_LOG=y
39-
CONFIG_NET_PKT_RX_COUNT=36
40-
CONFIG_NET_PKT_TX_COUNT=36
41-
CONFIG_NET_BUF_RX_COUNT=40
42-
CONFIG_NET_BUF_TX_COUNT=40
43-
CONFIG_NET_BUF_DATA_SIZE=1744
44-
CONFIG_NET_TCP_MAX_SEND_WINDOW_SIZE=46720
45-
CONFIG_NET_TCP_MAX_RECV_WINDOW_SIZE=46720
46-
CONFIG_NET_TC_TX_COUNT=1
47-
CONFIG_NET_TC_RX_COUNT=1
48-
CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=20
49-
CONFIG_NET_IF_MAX_IPV4_COUNT=2
50-
CONFIG_NET_IF_MAX_IPV6_COUNT=2
51-
CONFIG_DNS_RESOLVER=y
52-
CONFIG_DNS_RESOLVER_MAX_SERVERS=2
53-
CONFIG_NET_SOCKETS_POLL_MAX=14
54-
CONFIG_NET_ZPERF_MAX_SESSIONS=6
55-
CONFIG_NET_IPV4_FRAGMENT=y
56-
CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=3
57-
CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=7
58-
CONFIG_NET_IPV4_FRAGMENT_TIMEOUT=3
59-
CONFIG_NET_IPV6_FRAGMENT=y
60-
CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3
61-
CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8
62-
CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3
63-
CONFIG_NET_MAX_CONN=10
64-
65-
# net threads priority
66-
CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y
67-
CONFIG_NET_TC_THREAD_PREEMPTIVE=y
68-
CONFIG_NET_TCP_WORKER_PRIO=-16
69-
CONFIG_NET_TC_TX_THREAD_BASE_PRIO=3
70-
CONFIG_NET_TC_RX_THREAD_BASE_PRIO=3
71-
CONFIG_ZPERF_WORK_Q_THREAD_PRIORITY=3
72-
CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=3
73-
CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO=y
74-
CONFIG_NET_CONTEXT_PRIORITY=y
75-
CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
76-
CONFIG_NET_MGMT_THREAD_PRIORITY=3
77-
78-
# power management
79-
CONFIG_PM=y
80-
CONFIG_PM_DEVICE=y
81-
CONFIG_PM_LOG_LEVEL_OFF=y
82-
CONFIG_PM_DEVICE_LOG_LEVEL_OFF=y
83-
CONFIG_IDLE_STACK_SIZE=1024
843

854
# stack size
865
CONFIG_SHELL_STACK_SIZE=6144
876
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
887
CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
898
CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
909
CONFIG_MAIN_STACK_SIZE=4096
91-
CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
92-
93-
# optimization level
94-
# refer to Kconfig.zephyr for Optimizations Level
95-
CONFIG_SPEED_OPTIMIZATIONS=y
96-
#CONFIG_SIZE_OPTIMIZATIONS=y
97-
#CONFIG_DEBUG_OPTIMIZATIONS=y
98-
#CONFIG_NO_OPTIMIZATIONS=y
99-
100-
# debug & stats
101-
CONFIG_SYS_HEAP_VALIDATE=y
102-
CONFIG_SYS_HEAP_RUNTIME_STATS=y
103-
#CONFIG_NET_PKT_TXTIME_STATS=y
104-
#CONFIG_NET_PKT_TXTIME_STATS_DETAIL=y
105-
CONFIG_NET_STATISTICS_WIFI=y
106-
CONFIG_NET_STATISTICS_USER_API=y
107-
#CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=y
108-
#CONFIG_NET_BUF_POOL_USAGE=y
109-
#CONFIG_NET_DEBUG_NET_PKT_ALLOC=y
110-
111-
# stack size for -O0
112-
#CONFIG_SHELL_STACK_SIZE=8192
113-
#CONFIG_NET_TCP_WORKQ_STACK_SIZE=4096
114-
#CONFIG_NET_TX_STACK_SIZE=4096
115-
#CONFIG_NET_RX_STACK_SIZE=4096
116-
#CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
117-
#CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
118-
#CONFIG_MAIN_STACK_SIZE=4096
119-
#CONFIG_IDLE_STACK_SIZE=2048
120-
121-
# comment out for -O0
122-
CONFIG_CODE_DATA_RELOCATION_SRAM=y
10+
CONFIG_IDLE_STACK_SIZE=1024

samples/net/wifi/shell/boards/overlay_hostap_rw612.conf renamed to samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This conf is used for supplicant support, including enterprise,
2+
# WPS and DPP mode.
3+
14
# wpa_supplicant
25
CONFIG_WIFI_NM_WPA_SUPPLICANT=y
36
CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
@@ -20,22 +23,18 @@ CONFIG_ENTROPY_GENERATOR=y
2023
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
2124
CONFIG_MBEDTLS_ENTROPY_C=y
2225
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
26+
2327
# mbedtls heap for enterprise case
2428
CONFIG_MBEDTLS_ENABLE_HEAP=y
2529
CONFIG_MBEDTLS_HEAP_SIZE=69952
2630

27-
#priority
31+
# priority
2832
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=3
2933
CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
3034

3135
# stack size
3236
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
3337
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
3438

35-
# stack size for -O0
36-
#CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
37-
#CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
38-
3939
# debug level
40-
#CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
4140
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This conf is used for supplicant debug mode.
2+
3+
# stack size
4+
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
5+
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
6+
7+
# debug level
8+
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
9+
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG=y
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# This conf is used for adding SAP, IPv4/IPv6, Zperf, PM support,
2+
# and is optimized to get higher throughput performance.
3+
4+
# log & stats
5+
CONFIG_WIFI_LOG_LEVEL_DBG=y
6+
CONFIG_THREAD_LOCAL_STORAGE=y
7+
CONFIG_ASSERT=y
8+
CONFIG_ASSERT_LEVEL=2
9+
CONFIG_LOG_MODE_IMMEDIATE=y
10+
CONFIG_LOG_PRINTK=n
11+
CONFIG_SYS_HEAP_VALIDATE=y
12+
CONFIG_SYS_HEAP_RUNTIME_STATS=y
13+
CONFIG_NET_STATISTICS_WIFI=y
14+
CONFIG_NET_STATISTICS_USER_API=y
15+
16+
# lib & os
17+
CONFIG_REQUIRES_FULL_LIBC=y
18+
CONFIG_CBPRINTF_FP_SUPPORT=y
19+
CONFIG_THREAD_CUSTOM_DATA=y
20+
CONFIG_EVENTS=y
21+
CONFIG_SYS_HEAP_AUTO=y
22+
CONFIG_SCHED_MULTIQ=y
23+
CONFIG_ZVFS_OPEN_MAX=30
24+
25+
# shell
26+
CONFIG_SHELL_ARGC_MAX=48
27+
CONFIG_SHELL_CMD_BUFF_SIZE=512
28+
29+
# wifi
30+
CONFIG_NXP_WIFI_SOFTAP_SUPPORT=y
31+
CONFIG_WIFI_SHELL_MAX_AP_STA=8
32+
CONFIG_NXP_WIFI_TX_RX_ZERO_COPY=y
33+
34+
# net
35+
CONFIG_NET_IPV4=y
36+
CONFIG_NET_IPV6=y
37+
CONFIG_NET_ZPERF=y
38+
CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500
39+
CONFIG_NET_BUF_LOG=y
40+
CONFIG_NET_PKT_RX_COUNT=36
41+
CONFIG_NET_PKT_TX_COUNT=36
42+
CONFIG_NET_BUF_RX_COUNT=40
43+
CONFIG_NET_BUF_TX_COUNT=40
44+
CONFIG_NET_BUF_DATA_SIZE=1744
45+
CONFIG_NET_TCP_MAX_SEND_WINDOW_SIZE=46720
46+
CONFIG_NET_TCP_MAX_RECV_WINDOW_SIZE=46720
47+
CONFIG_NET_TC_TX_COUNT=1
48+
CONFIG_NET_TC_RX_COUNT=1
49+
CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=20
50+
CONFIG_NET_IF_MAX_IPV4_COUNT=2
51+
CONFIG_NET_IF_MAX_IPV6_COUNT=2
52+
CONFIG_DNS_RESOLVER=y
53+
CONFIG_DNS_RESOLVER_MAX_SERVERS=2
54+
CONFIG_NET_SOCKETS_POLL_MAX=14
55+
CONFIG_NET_ZPERF_MAX_SESSIONS=6
56+
CONFIG_NET_IPV4_FRAGMENT=y
57+
CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=3
58+
CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=7
59+
CONFIG_NET_IPV4_FRAGMENT_TIMEOUT=3
60+
CONFIG_NET_IPV6_FRAGMENT=y
61+
CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3
62+
CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8
63+
CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3
64+
CONFIG_NET_MAX_CONN=10
65+
66+
# net threads priority
67+
CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y
68+
CONFIG_NET_TC_THREAD_PREEMPTIVE=y
69+
CONFIG_NET_TCP_WORKER_PRIO=-16
70+
CONFIG_NET_TC_TX_THREAD_BASE_PRIO=3
71+
CONFIG_NET_TC_RX_THREAD_BASE_PRIO=3
72+
CONFIG_ZPERF_WORK_Q_THREAD_PRIORITY=3
73+
CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=3
74+
CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO=y
75+
CONFIG_NET_CONTEXT_PRIORITY=y
76+
CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
77+
CONFIG_NET_MGMT_THREAD_PRIORITY=3
78+
79+
# stack size
80+
CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
81+
82+
# power management
83+
CONFIG_PM=y
84+
CONFIG_PM_DEVICE=y
85+
CONFIG_PM_LOG_LEVEL_OFF=y
86+
CONFIG_PM_DEVICE_LOG_LEVEL_OFF=y
87+
88+
# optimization level
89+
CONFIG_SPEED_OPTIMIZATIONS=y
90+
91+
# data relocation
92+
CONFIG_CODE_DATA_RELOCATION_SRAM=y

0 commit comments

Comments
 (0)