Skip to content

Commit 6027eb6

Browse files
dinabenamardinabenamar
authored
[NXP][cmake][common] Add default configuration for all NXP platforms to support cmake builds with or without "CONF_FILE" (#39147)
* [NXP][cmake][common] Add a default configuration for all platforms to make sure application can build if no "CONF_FILE" is provided * Enabling wifi by default for RT & RW platforms * Enabling thread by default for MCXW7* platforms Signed-off-by: Dina Benamar <[email protected]> * [NXP][cmake][common] Make sure wifi/OT Kconfig are disabled when building in ethernet configuration Signed-off-by: Dina Benamar <[email protected]> * [NXP][common] Update examples/platform/nxp/config/prj_eth_ota_fdata_v2.conf to disabled wifi/ot Kconfig Signed-off-by: Dina Benamar <[email protected]> --------- Signed-off-by: Dina Benamar <[email protected]>
1 parent 467a218 commit 6027eb6

27 files changed

+34
-51
lines changed

‎config/nxp/chip-cmake-freertos/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ endif # NET_L2_OPENTHREAD
208208

209209
config CHIP_IPV4
210210
bool "IPv4 support for Matter"
211+
default n if CHIP_NET_L2_OPENTHREAD && !CHIP_WIFI
211212
default y
212213
help
213214
If disabled, it allows to build NXP SDK application

‎config/nxp/chip-cmake-freertos/Kconfig.defaults

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020

2121
if CHIP
2222

23+
config CHIP_WIFI
24+
default y if CHIP_NXP_PLATFORM_RW61X || CHIP_NXP_PLATFORM_RT1170 || CHIP_NXP_PLATFORM_RT1060
25+
26+
config CHIP_NET_L2_OPENTHREAD
27+
default y if CHIP_NXP_PLATFORM_MCXW71 || CHIP_NXP_PLATFORM_K32W1 || CHIP_NXP_PLATFORM_MCXW72
28+
2329
config CHIP_OPERATIONAL_TIME_SAVE_INTERVAL
2430
default 1
2531

‎config/nxp/cmake/Kconfig.matter.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ config CHIP_OPENTHREAD_CONFIG
431431

432432
config CHIP_OPENTHREAD_FTD
433433
bool "App is an OpenThread FTD"
434+
default y
434435
help
435436
App is an OpenThread FTD
436437

‎examples/all-clusters-app/nxp/prj.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ CONFIG_CHIP_LIB_SHELL=y
2222
CONFIG_BT_DEVICE_NAME="\"NXPAllClusters\""
2323
CONFIG_CHIP_DEVICE_PRODUCT_NAME="All Clusters"
2424
CONFIG_CHIP_DEVICE_TYPE=115
25+
26+
# SDK configs
27+
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_eth.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# CHIP configs
2020
CONFIG_CHIP_ETHERNET=y
2121
CONFIG_BT=n
22+
CONFIG_CHIP_WIFI=n
23+
CONFIG_NET_L2_OPENTHREAD=n
2224

2325
# SDK configs
2426
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_eth_fdata.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# CHIP configs
2020
CONFIG_CHIP_ETHERNET=y
2121
CONFIG_BT=n
22+
CONFIG_CHIP_WIFI=n
23+
CONFIG_NET_L2_OPENTHREAD=n
2224

2325
# Use factory data provider for device info
2426
CONFIG_CHIP_FACTORY_DATA=y

‎examples/platform/nxp/config/prj_eth_ota.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# CHIP configs
2020
CONFIG_CHIP_ETHERNET=y
2121
CONFIG_BT=n
22+
CONFIG_CHIP_WIFI=n
23+
CONFIG_NET_L2_OPENTHREAD=n
2224

2325
# OTA Requestor configs
2426
CONFIG_CHIP_OTA_REQUESTOR=y

‎examples/platform/nxp/config/prj_eth_ota_fdata.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# CHIP configs
2020
CONFIG_CHIP_ETHERNET=y
2121
CONFIG_BT=n
22+
CONFIG_CHIP_WIFI=n
23+
CONFIG_NET_L2_OPENTHREAD=n
2224

2325
# OTA Requestor configs
2426
CONFIG_CHIP_OTA_REQUESTOR=y

‎examples/platform/nxp/config/prj_eth_ota_fdata_v2.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# CHIP configs
2020
CONFIG_CHIP_ETHERNET=y
2121
CONFIG_BT=n
22+
CONFIG_CHIP_WIFI=n
23+
CONFIG_NET_L2_OPENTHREAD=n
2224

2325
# OTA Requestor configs
2426
CONFIG_CHIP_OTA_REQUESTOR=y

‎examples/platform/nxp/config/prj_thread_ftd.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ CONFIG_NET_L2_OPENTHREAD=y
2121
CONFIG_CHIP_OPENTHREAD_FTD=y
2222
CONFIG_CHIP_IPV4=n
2323

24-
# SDK configs
25-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n
24+
CONFIG_CHIP_WIFI=n

‎examples/platform/nxp/config/prj_thread_ftd_fdata.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ CONFIG_NET_L2_OPENTHREAD=y
2121
CONFIG_CHIP_OPENTHREAD_FTD=y
2222
CONFIG_CHIP_IPV4=n
2323

24+
CONFIG_CHIP_WIFI=n
25+
2426
# Use factory data provider for device info
2527
CONFIG_CHIP_FACTORY_DATA=y
2628

@@ -30,6 +32,3 @@ CONFIG_CHIP_FACTORY_DATA=y
3032
# Factory data configuration
3133
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
3234
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
33-
34-
# SDK configs
35-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_ftd_ota.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ CONFIG_NET_L2_OPENTHREAD=y
2121
CONFIG_CHIP_OPENTHREAD_FTD=y
2222
CONFIG_CHIP_IPV4=n
2323

24+
CONFIG_CHIP_WIFI=n
25+
2426
# OTA Requestor configs
2527
CONFIG_CHIP_OTA_REQUESTOR=y
2628
# Disable OTA Update image build
2729
# CONFIG_CHIP_OTA_IMAGE_BUILD=n
28-
29-
# SDK configs
30-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_ftd_ota_fdata.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ CONFIG_NET_L2_OPENTHREAD=y
2121
CONFIG_CHIP_OPENTHREAD_FTD=y
2222
CONFIG_CHIP_IPV4=n
2323

24+
CONFIG_CHIP_WIFI=n
25+
2426
# OTA Requestor configs
2527
CONFIG_CHIP_OTA_REQUESTOR=y
2628
# Disable OTA Update image build
@@ -35,6 +37,3 @@ CONFIG_CHIP_FACTORY_DATA=y
3537
# Factory data configuration
3638
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
3739
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
38-
39-
# SDK configs
40-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_ftd_wifi_br_ota.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ CONFIG_CHIP_THREAD_NETWORK_ENDPOINT_ID=2
2727
CONFIG_CHIP_OTA_REQUESTOR=y
2828
# Disable OTA Update image build
2929
# CONFIG_CHIP_OTA_IMAGE_BUILD=n
30-
31-
# SDK configs
32-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_ftd_wifi_br_ota_fdata.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,3 @@ CONFIG_CHIP_FACTORY_DATA=y
3737
# Factory data configuration
3838
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
3939
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
40-
41-
# SDK configs
42-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_ftd_wifi_br_ota_fdata_v2.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,3 @@ CONFIG_CHIP_FACTORY_DATA=y
3939
# Factory data configuration
4040
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
4141
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
42-
43-
# SDK configs
44-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_ftd_wifi_br_ota_v2.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,3 @@ CONFIG_CHIP_OTA_REQUESTOR=y
2929
# CONFIG_CHIP_OTA_IMAGE_BUILD=n
3030
CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2
3131
CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING="2.0"
32-
33-
# SDK configs
34-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_mtd.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
CONFIG_NET_L2_OPENTHREAD=y
2020
CONFIG_CHIP_IPV4=n
21+
CONFIG_CHIP_OPENTHREAD_FTD=n
2122
CONFIG_MINIMAL_END_DEVICE=y
2223
CONFIG_CHIP_ENABLE_ICD_SUPPORT=y
23-
24-
# Use board files from SDK framework
25-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_thread_mtd_low_power.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818

1919
CONFIG_NET_L2_OPENTHREAD=y
2020
CONFIG_CHIP_IPV4=n
21+
CONFIG_CHIP_OPENTHREAD_FTD=n
2122
CONFIG_MINIMAL_END_DEVICE=y
2223
CONFIG_CHIP_LIB_SHELL=n
2324
CONFIG_NXP_USE_LOW_POWER=y
24-
CONFIG_CHIP_ENABLE_ICD_SUPPORT=y
25-
26-
# Use board files from SDK framework
27-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n
25+
CONFIG_CHIP_ENABLE_ICD_SUPPORT=y

‎examples/platform/nxp/config/prj_wifi.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,3 @@
1818

1919
# CHIP configs
2020
CONFIG_CHIP_WIFI=y
21-
22-
# SDK configs
23-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_wifi_fdata.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@ CONFIG_CHIP_FACTORY_DATA=y
2828
# Factory data configuration
2929
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
3030
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
31-
32-
# SDK configs
33-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_wifi_onnetwork.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ CONFIG_CHIP_WIFI=y
2222
CONFIG_BT=n
2323
CONFIG_CHIP_APP_WIFI_CONNECT_AT_BOOT=y
2424

25-
# SDK configs
26-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n
27-
2825
# Note :
2926
# In this configuration, "CONFIG_CHIP_APP_WIFI_SSID" and "CONFIG_CHIP_APP_WIFI_PASSWORD"
3027
# should be provided in the build command-line, for the app to connect to the wifi network at boot.

‎examples/platform/nxp/config/prj_wifi_ota.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ CONFIG_CHIP_OTA_REQUESTOR=y
2424

2525
# Disable OTA Update image build
2626
# CONFIG_CHIP_OTA_IMAGE_BUILD=n
27-
28-
# SDK configs
29-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_wifi_ota_fdata.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,3 @@ CONFIG_CHIP_FACTORY_DATA=y
3333
# Factory data configuration
3434
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
3535
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
36-
37-
# SDK configs
38-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_wifi_ota_fdata_v2.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@ CONFIG_CHIP_FACTORY_DATA=y
3535
# Factory data configuration
3636
CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED=y
3737
CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y
38-
39-
# SDK configs
40-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/platform/nxp/config/prj_wifi_ota_v2.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,3 @@ CONFIG_CHIP_OTA_REQUESTOR=y
2525
# CONFIG_CHIP_OTA_IMAGE_BUILD=n
2626
CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2
2727
CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING="2.0"
28-
29-
# SDK configs
30-
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

‎examples/thermostat/nxp/prj.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ CONFIG_BT_DEVICE_NAME="\"NXPThermostat\""
2323
CONFIG_CHIP_DEVICE_PRODUCT_NAME="Thermostat"
2424
CONFIG_CHIP_DEVICE_TYPE=769
2525
CONFIG_CHIP_CUSTOM_BLE_ADV_DATA=y
26+
27+
# SDK configs
28+
CONFIG_MCUX_PRJSEG_module.board.boardfile=n

0 commit comments

Comments
 (0)