Skip to content

Commit d29affc

Browse files
krish2718bjarki-andreasen
krish2718
authored and
bjarki-andreasen
committed
[nrf noup] wifi: Migrate to nRF70 upstream
nRF70 support moved upstream, update the names. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
1 parent be30c50 commit d29affc

File tree

13 files changed

+34
-34
lines changed

13 files changed

+34
-34
lines changed

‎config/nrfconnect/chip-module/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ matter_add_gn_arg_bool ("chip_progress_logging" CONFIG_MATTER_
140140
matter_add_gn_arg_bool ("chip_detail_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
141141
matter_add_gn_arg_bool ("chip_automation_logging" FALSE)
142142
matter_add_gn_arg_bool ("chip_malloc_sys_heap" CONFIG_CHIP_MALLOC_SYS_HEAP)
143-
matter_add_gn_arg_bool ("chip_enable_wifi" CONFIG_WIFI_NRF700X)
143+
matter_add_gn_arg_bool ("chip_enable_wifi" CONFIG_WIFI_NRF70)
144144
matter_add_gn_arg_bool ("chip_system_config_provide_statistics" CONFIG_CHIP_STATISTICS)
145145
matter_add_gn_arg_bool ("chip_enable_icd_server" CONFIG_CHIP_ENABLE_ICD_SUPPORT)
146146
matter_add_gn_arg_bool ("chip_enable_factory_data" CONFIG_CHIP_FACTORY_DATA)
147147
matter_add_gn_arg_bool ("chip_enable_read_client" CONFIG_CHIP_ENABLE_READ_CLIENT)
148-
matter_add_gn_arg_bool ("chip_mdns_minimal" CONFIG_WIFI_NRF700X)
148+
matter_add_gn_arg_bool ("chip_mdns_minimal" CONFIG_WIFI_NRF70)
149149
matter_add_gn_arg_bool ("chip_mdns_platform" CONFIG_NET_L2_OPENTHREAD)
150150

151151
if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
@@ -165,7 +165,7 @@ if (CONFIG_CHIP_ROTATING_DEVICE_ID)
165165
matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
166166
endif()
167167

168-
if(CONFIG_WIFI_NRF700X)
168+
if(CONFIG_WIFI_NRF70)
169169
matter_add_gn_arg_string("chip_mdns" "minimal")
170170
elseif (CONFIG_NET_L2_OPENTHREAD)
171171
matter_add_gn_arg_string("chip_mdns" "platform")

‎config/nrfconnect/chip-module/Kconfig.defaults

+11-11
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ config NRF_WIFI_FW_PATCH_DFU
227227
# ==============================================================================
228228

229229
config NET_L2_OPENTHREAD
230-
default y if !WIFI_NRF700X
230+
default y if !WIFI_NRF70
231231

232232
if NET_L2_OPENTHREAD
233233

@@ -252,35 +252,35 @@ endif # NET_L2_OPENTHREAD
252252

253253
if CHIP_WIFI
254254

255-
choice WPA_SUPP_LOG_LEVEL_CHOICE
256-
default WPA_SUPP_LOG_LEVEL_ERR
255+
choice WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_CHOICE
256+
default WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_ERR
257257
endchoice
258258

259259
# it saves us 20kB of FLASH
260-
config WPA_SUPP_NO_DEBUG
260+
config WIFI_NM_WPA_SUPPLICANT_NO_DEBUG
261261
default y
262262

263-
config NRF700X_LOG_VERBOSE
263+
config NRF70_LOG_VERBOSE
264264
default n
265265

266-
choice WIFI_NRF700X_LOG_LEVEL_CHOICE
267-
default WIFI_NRF700X_LOG_LEVEL_OFF
266+
choice WIFI_NRF70_LOG_LEVEL_CHOICE
267+
default WIFI_NRF70_LOG_LEVEL_OFF
268268
endchoice
269269

270270
config NRF_WIFI_LOW_POWER
271271
default n
272272

273-
config NRF700X_RX_NUM_BUFS
273+
config NRF70_RX_NUM_BUFS
274274
default 16
275275

276-
config NRF700X_MAX_TX_TOKENS
276+
config NRF70_MAX_TX_TOKENS
277277
default 10
278278

279-
config NRF700X_MAX_TX_AGGREGATION
279+
config NRF70_MAX_TX_AGGREGATION
280280
default 1
281281

282282
# it saves 25kB of FLASH
283-
config WPA_SUPP_ADVANCED_FEATURES
283+
config WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES
284284
default n
285285

286286
endif # CHIP_WIFI

‎config/nrfconnect/chip-module/Kconfig.features

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ if CHIP
2222
config CHIP_WIFI
2323
bool "Enable nrfconnect Wi-Fi support"
2424
default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
25-
select WIFI_NRF700X
25+
select WIFI_NRF70
2626
select WIFI
27-
select WPA_SUPP
27+
select WIFI_NM_WPA_SUPPLICANT
2828
imply NORDIC_SECURITY_BACKEND
2929
imply MBEDTLS_ENTROPY_C
3030
imply MBEDTLS_PSA_CRYPTO_C

‎config/nxp/chip-module/Kconfig.features

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ config CHIP_WIFI
2424
default y
2525
select WIFI
2626
select WIFI_NXP
27-
select WPA_SUPP
28-
select WPA_SUPP_AP
29-
select WPA_SUPP_WPS
30-
select WPA_SUPP_WPA3
31-
select WPA_SUPP_CRYPTO_ENTERPRISE
27+
select WIFI_NM_WPA_SUPPLICANT
28+
select WIFI_NM_WPA_SUPPLICANT_AP
29+
select WIFI_NM_WPA_SUPPLICANT_WPS
30+
select WIFI_NM_WPA_SUPPLICANT_WPA3
31+
select WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
3232
imply MBEDTLS_ENTROPY_C
3333
imply NET_STATISTICS
3434
imply NET_PKT_TXTIME

‎examples/chef/nrfconnect/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ int main()
109109
ChipLogError(AppServer, "ConnectivityMgr().SetThreadDeviceType() failed");
110110
return 1;
111111
}
112-
#elif !defined(CONFIG_WIFI_NRF700X)
112+
#elif !defined(CONFIG_WIFI_NRF70)
113113
return CHIP_ERROR_INTERNAL;
114114
#endif
115115

‎examples/pump-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ CHIP_ERROR AppTask::Init()
137137
LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
138138
return err;
139139
}
140-
#elif !defined(CONFIG_WIFI_NRF700X)
140+
#elif !defined(CONFIG_WIFI_NRF70)
141141
return CHIP_ERROR_INTERNAL;
142142
#endif
143143

‎examples/pump-controller-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ CHIP_ERROR AppTask::Init()
125125
LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
126126
return err;
127127
}
128-
#elif !defined(CONFIG_WIFI_NRF700X)
128+
#elif !defined(CONFIG_WIFI_NRF70)
129129
return CHIP_ERROR_INTERNAL;
130130
#endif
131131

‎examples/window-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ CHIP_ERROR AppTask::Init()
142142
LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
143143
return err;
144144
}
145-
#elif !defined(CONFIG_WIFI_NRF700X)
145+
#elif !defined(CONFIG_WIFI_NRF70)
146146
return CHIP_ERROR_INTERNAL;
147147
#endif
148148

‎src/platform/nrfconnect/CHIPDevicePlatformConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
6565
#endif
6666

67-
#ifdef CONFIG_WIFI_NRF700X
68-
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_WIFI_NRF700X
67+
#ifdef CONFIG_WIFI_NRF70
68+
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_WIFI_NRF70
6969
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
7070
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
7171
#else

‎src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "DiagnosticDataProviderImplNrf.h"
2525

26-
#ifdef CONFIG_WIFI_NRF700X
26+
#ifdef CONFIG_WIFI_NRF70
2727
#include <platform/nrfconnect/wifi/WiFiManager.h>
2828
#endif
2929

@@ -41,7 +41,7 @@ DiagnosticDataProviderImplNrf & DiagnosticDataProviderImplNrf::GetDefaultInstanc
4141
return sInstance;
4242
}
4343

44-
#ifdef CONFIG_WIFI_NRF700X
44+
#ifdef CONFIG_WIFI_NRF70
4545
CHIP_ERROR DiagnosticDataProviderImplNrf::GetWiFiBssId(MutableByteSpan & value)
4646
{
4747
WiFiManager::WiFiInfo info;

‎src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace DeviceLayer {
3131
class DiagnosticDataProviderImplNrf : public DiagnosticDataProviderImpl
3232
{
3333
public:
34-
#ifdef CONFIG_WIFI_NRF700X
34+
#ifdef CONFIG_WIFI_NRF70
3535
CHIP_ERROR GetWiFiBssId(MutableByteSpan & value) override;
3636
CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
3737
CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;

‎src/platform/nrfconnect/SystemPlatformConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct ChipDeviceEvent;
5252
#endif
5353

5454
#ifndef CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX
55-
#ifdef CONFIG_WIFI_NRF700X
55+
#ifdef CONFIG_WIFI_NRF70
5656
// Minimal mDNS uses Matter packet buffers, so as long as minimal mDNS is used
5757
// in Nordic's Wi-Fi solution, the packet buffers must be a bit bigger than what
5858
// is required by Matter.
@@ -62,7 +62,7 @@ struct ChipDeviceEvent;
6262
// unless for large messages that can be sent over BTP or TCP. But those will
6363
// likely require a separate buffer pool or employ chained buffers.
6464
#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX 1280
65-
#endif // CONFIG_WIFI_NRF700X
65+
#endif // CONFIG_WIFI_NRF70
6666
#endif // CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX
6767

6868
// ========== Platform-specific Configuration Overrides =========

‎src/platform/nxp/zephyr/nxp-zephyr-mbedtls-config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
#define MBEDTLS_CIPHER_PADDING_PKCS7
2626

27-
#if CONFIG_WIFI_NXP && CONFIG_WPA_SUPP
27+
#if CONFIG_WIFI_NXP && CONFIG_WIFI_NM_WPA_SUPPLICANT
2828
#include "wpa_supp_els_pkc_mbedtls_config.h"
29-
#endif /* CONFIG_WIFI_NXP && CONFIG_WPA_SUPP */
29+
#endif /* CONFIG_WIFI_NXP && CONFIG_WIFI_NM_WPA_SUPPLICANT */
3030

3131
#if CONFIG_MCUX_PSA_CRYPTO_DRIVER_ELS_PKC
3232
#define PSA_CRYPTO_DRIVER_ELS_PKC

0 commit comments

Comments
 (0)