Skip to content

Commit 89c8d33

Browse files
marius-alex-tachedoru91restyled-commits
authored
[NXP] Move some components in common (#35594)
* [nxp][platform][common] Rename S200 crypto PAL and move it to common Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][examples][common] Make S200 Operational Keystore common Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][platform][common] Make k32w1 BLEManager implementation common This can be reused by other platforms as long as they are using the same SDK. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][platform][common] Move OTA related files to a common folder OTAFirmwareProcessor and OTAHooks could be reused by other platforms as long as the SDK is the same, so moving them from k32w1 folder. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][platform][common] Move Factory Data provider into a common folder Some components were implemented for k32w1, but can be reused as long as the used SDK is the same. Moving them to factory_data/legacy until synchronizing with the other factory data implementation. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][platform][k32w0] Update files after moving some components Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][mcxw71_k32w1] Update build system after moving some components Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][examples][k32w0] Update build system after moving some components Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][scripts][common] Update list of supported devices for multi-image OTA Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp] Bump nxp_matter_support Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][mcxw71_k32w1][lock-app] Update build system after moving some components Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [nxp][mcxw71_k32w1] Fix factory data compilation issue Signed-off-by: Doru Gucea <doru-cristian.gucea@nxp.com> * Restyled by gn * [nxp][ota] Fix spelling of platforms Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * Restyled by gn * [nxp][platform][k32w0] Move setting of k32w0_sdk_root k32w0_sdk_root set was moved to nxp_matter_support submodule Signed-off-by: Marius Tache <marius.tache@nxp.com> --------- Signed-off-by: marius-alex-tache <marius.tache@nxp.com> Signed-off-by: Doru Gucea <doru-cristian.gucea@nxp.com> Signed-off-by: Marius Tache <marius.tache@nxp.com> Co-authored-by: Doru Gucea <doru-cristian.gucea@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 514e810 commit 89c8d33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+215
-397
lines changed

‎examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
4343
#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
4444
#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
45-
#include <src/platform/nxp/common/legacy/OTAImageProcessorImpl.h>
45+
#include <src/platform/nxp/common/ota/OTAImageProcessorImpl.h>
4646
#endif
4747

4848
#include <src/platform/nxp/k32w0/BLEManagerImpl.h>

‎examples/contact-sensor-app/nxp/k32w1/BUILD.gn

+15-5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ assert(target_os == "freertos")
3939

4040
example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
4141
common_example_dir = "${chip_root}/examples/platform/nxp/common"
42+
support_common_platform_dir =
43+
"${nxp_sdk_matter_support_root}/examples/platform/common"
4244

4345
mcxw71_k32w1_sdk("sdk") {
4446
defines = []
@@ -54,6 +56,9 @@ mcxw71_k32w1_sdk("sdk") {
5456
# Indicate the default path to OpenThreadConfig.h
5557
include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
5658

59+
# Indicate the default path to GATT database
60+
include_dirs += [ "${support_common_platform_dir}/ble" ]
61+
5762
include_dirs += [
5863
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
5964
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
@@ -69,6 +74,7 @@ mcxw71_k32w1_sdk("sdk") {
6974
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
7075
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
7176
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
77+
"${support_common_platform_dir}/ble/ble_function_mux.c",
7278
]
7379

7480
if (is_debug) {
@@ -104,7 +110,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
104110
"CONFIG_NETWORK_LAYER_BLE=1",
105111
"CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
106112
"CONFIG_OPERATIONAL_KEYSTORE=1",
107-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
113+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
108114
]
109115

110116
if (chip_with_diag_logs_demo) {
@@ -141,6 +147,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
141147
"${common_example_dir}/clusters/source/ZclCallbacks.cpp",
142148
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
143149
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
150+
"${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
144151
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
145152
]
146153

@@ -149,19 +156,23 @@ mcxw71_k32w1_executable("contact_sensor_app") {
149156
}
150157

151158
if (chip_with_factory_data == 1) {
152-
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
159+
include_dirs +=
160+
[ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
153161
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
154162
}
155163

156164
if (chip_enable_ota_requestor) {
157165
defines += [
158-
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
166+
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
159167

160168
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
161169
"LED_MANAGER_ENABLE_STATUS_LED=0",
162170
]
163171

164-
include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
172+
include_dirs += [
173+
"${common_example_dir}/ota_requestor/include",
174+
"${chip_root}/src/platform/nxp/common/ota",
175+
]
165176
sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
166177
deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
167178
}
@@ -183,7 +194,6 @@ mcxw71_k32w1_executable("contact_sensor_app") {
183194
sources += [
184195
"${example_platform_dir}/button/ButtonManager.cpp",
185196
"${example_platform_dir}/clusters/Identify.cpp",
186-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
187197
]
188198

189199
if (chip_enable_ota_requestor) {

‎examples/contact-sensor-app/nxp/mcxw71/BUILD.gn

+15-5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ assert(target_os == "freertos")
3838

3939
example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
4040
common_example_dir = "${chip_root}/examples/platform/nxp/common"
41+
support_common_platform_dir =
42+
"${nxp_sdk_matter_support_root}/examples/platform/common"
4143

4244
mcxw71_k32w1_sdk("sdk") {
4345
defines = []
@@ -53,6 +55,9 @@ mcxw71_k32w1_sdk("sdk") {
5355
# Indicate the default path to OpenThreadConfig.h
5456
include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
5557

58+
# Indicate the default path to GATT database
59+
include_dirs += [ "${support_common_platform_dir}/ble" ]
60+
5661
include_dirs += [
5762
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
5863
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/MCXW716C",
@@ -68,6 +73,7 @@ mcxw71_k32w1_sdk("sdk") {
6873
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
6974
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
7075
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
76+
"${support_common_platform_dir}/ble/ble_function_mux.c",
7177
]
7278

7379
if (is_debug) {
@@ -103,7 +109,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
103109
"CONFIG_NETWORK_LAYER_BLE=1",
104110
"CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
105111
"CONFIG_OPERATIONAL_KEYSTORE=1",
106-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
112+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
107113
]
108114

109115
if (chip_with_diag_logs_demo) {
@@ -140,6 +146,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
140146
"${common_example_dir}/clusters/source/ZclCallbacks.cpp",
141147
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
142148
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
149+
"${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
143150
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
144151
]
145152

@@ -148,19 +155,23 @@ mcxw71_k32w1_executable("contact_sensor_app") {
148155
}
149156

150157
if (chip_with_factory_data == 1) {
151-
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
158+
include_dirs +=
159+
[ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
152160
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
153161
}
154162

155163
if (chip_enable_ota_requestor) {
156164
defines += [
157-
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
165+
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
158166

159167
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
160168
"LED_MANAGER_ENABLE_STATUS_LED=0",
161169
]
162170

163-
include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
171+
include_dirs += [
172+
"${common_example_dir}/ota_requestor/include",
173+
"${chip_root}/src/platform/nxp/common/ota",
174+
]
164175
sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
165176
deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
166177
}
@@ -182,7 +193,6 @@ mcxw71_k32w1_executable("contact_sensor_app") {
182193
sources += [
183194
"${example_platform_dir}/button/ButtonManager.cpp",
184195
"${example_platform_dir}/clusters/Identify.cpp",
185-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
186196
]
187197

188198
if (chip_enable_ota_requestor) {

‎examples/lighting-app/nxp/k32w0/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
4444
#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
4545
#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
46-
#include <src/platform/nxp/common/legacy/OTAImageProcessorImpl.h>
46+
#include <src/platform/nxp/common/ota/OTAImageProcessorImpl.h>
4747
#endif
4848

4949
#include "DefaultTestEventTriggerDelegate.h"

‎examples/lighting-app/nxp/k32w1/BUILD.gn

+11-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ assert(target_os == "freertos")
4444

4545
example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
4646
common_example_dir = "${chip_root}/examples/platform/nxp/common"
47+
support_common_platform_dir =
48+
"${nxp_sdk_matter_support_root}/examples/platform/common"
4749

4850
mcxw71_k32w1_sdk("sdk") {
4951
defines = []
@@ -59,6 +61,9 @@ mcxw71_k32w1_sdk("sdk") {
5961
# Indicate the default path to OpenThreadConfig.h
6062
include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
6163

64+
# Indicate the default path to GATT database
65+
include_dirs += [ "${support_common_platform_dir}/ble" ]
66+
6267
include_dirs += [
6368
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
6469
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
@@ -74,6 +79,7 @@ mcxw71_k32w1_sdk("sdk") {
7479
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
7580
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
7681
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
82+
"${support_common_platform_dir}/ble/ble_function_mux.c",
7783
]
7884

7985
if (is_debug) {
@@ -125,7 +131,7 @@ mcxw71_k32w1_executable("light_app") {
125131
"CONFIG_OPERATIONAL_KEYSTORE=1",
126132
"CONFIG_ENABLE_FEEDBACK=1",
127133
"APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)",
128-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
134+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
129135
]
130136

131137
# App common files
@@ -148,12 +154,13 @@ mcxw71_k32w1_executable("light_app") {
148154
"${common_example_dir}/clusters/source/ZclCallbacks.cpp",
149155
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
150156
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
157+
"${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
151158
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
152159
]
153160

154161
if (chip_enable_ota_requestor) {
155162
defines += [
156-
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
163+
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
157164

158165
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
159166
"LED_MANAGER_ENABLE_STATUS_LED=0",
@@ -174,7 +181,6 @@ mcxw71_k32w1_executable("light_app") {
174181
sources += [
175182
"${example_platform_dir}/button/ButtonManager.cpp",
176183
"${example_platform_dir}/clusters/Identify.cpp",
177-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
178184
]
179185

180186
if (chip_enable_ota_requestor) {
@@ -186,7 +192,8 @@ mcxw71_k32w1_executable("light_app") {
186192
}
187193

188194
if (chip_with_factory_data == 1) {
189-
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
195+
include_dirs +=
196+
[ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
190197
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
191198
}
192199

‎examples/lighting-app/nxp/mcxw71/BUILD.gn

+15-5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ assert(target_os == "freertos")
4444

4545
example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
4646
common_example_dir = "${chip_root}/examples/platform/nxp/common"
47+
support_common_platform_dir =
48+
"${nxp_sdk_matter_support_root}/examples/platform/common"
4749

4850
mcxw71_k32w1_sdk("sdk") {
4951
defines = []
@@ -59,6 +61,9 @@ mcxw71_k32w1_sdk("sdk") {
5961
# Indicate the default path to OpenThreadConfig.h
6062
include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
6163

64+
# Indicate the default path to GATT database
65+
include_dirs += [ "${support_common_platform_dir}/ble" ]
66+
6267
include_dirs += [
6368
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
6469
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/MCXW716C",
@@ -74,6 +79,7 @@ mcxw71_k32w1_sdk("sdk") {
7479
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
7580
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
7681
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
82+
"${support_common_platform_dir}/ble/ble_function_mux.c",
7783
]
7884

7985
if (is_debug) {
@@ -125,7 +131,7 @@ mcxw71_k32w1_executable("light_app") {
125131
"CONFIG_OPERATIONAL_KEYSTORE=1",
126132
"CONFIG_ENABLE_FEEDBACK=1",
127133
"APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)",
128-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
134+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
129135
]
130136

131137
# App common files
@@ -148,18 +154,22 @@ mcxw71_k32w1_executable("light_app") {
148154
"${common_example_dir}/clusters/source/ZclCallbacks.cpp",
149155
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
150156
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
157+
"${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
151158
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
152159
]
153160

154161
if (chip_enable_ota_requestor) {
155162
defines += [
156-
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
163+
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
157164

158165
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
159166
"LED_MANAGER_ENABLE_STATUS_LED=0",
160167
]
161168

162-
include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
169+
include_dirs += [
170+
"${common_example_dir}/ota_requestor/include",
171+
"${chip_root}/src/platform/nxp/common/ota",
172+
]
163173
sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
164174
deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
165175
}
@@ -174,7 +184,6 @@ mcxw71_k32w1_executable("light_app") {
174184
sources += [
175185
"${example_platform_dir}/button/ButtonManager.cpp",
176186
"${example_platform_dir}/clusters/Identify.cpp",
177-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
178187
]
179188

180189
if (chip_enable_ota_requestor) {
@@ -186,7 +195,8 @@ mcxw71_k32w1_executable("light_app") {
186195
}
187196

188197
if (chip_with_factory_data == 1) {
189-
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
198+
include_dirs +=
199+
[ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
190200
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
191201
}
192202

‎examples/lock-app/nxp/k32w1/BUILD.gn

+11-4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ assert(target_os == "freertos")
3737

3838
example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
3939
common_example_dir = "${chip_root}/examples/platform/nxp/common"
40+
support_common_platform_dir =
41+
"${nxp_sdk_matter_support_root}/examples/platform/common"
4042

4143
mcxw71_k32w1_sdk("sdk") {
4244
defines = []
@@ -52,6 +54,9 @@ mcxw71_k32w1_sdk("sdk") {
5254
# Indicate the default path to OpenThreadConfig.h
5355
include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
5456

57+
# Indicate the default path to GATT database
58+
include_dirs += [ "${support_common_platform_dir}/ble" ]
59+
5560
include_dirs += [
5661
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
5762
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
@@ -67,6 +72,7 @@ mcxw71_k32w1_sdk("sdk") {
6772
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
6873
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
6974
"${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
75+
"${support_common_platform_dir}/ble/ble_function_mux.c",
7076
]
7177

7278
if (is_debug) {
@@ -102,7 +108,7 @@ mcxw71_k32w1_executable("lock_app") {
102108
"CONFIG_NETWORK_LAYER_BLE=1",
103109
"CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
104110
"CONFIG_OPERATIONAL_KEYSTORE=1",
105-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
111+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
106112
"CONFIG_APP_FREERTOS_OS=1",
107113
]
108114

@@ -144,6 +150,7 @@ mcxw71_k32w1_executable("lock_app") {
144150
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
145151
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
146152
"${common_example_dir}/icd/source/ICDUtil.cpp",
153+
"${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
147154
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
148155
]
149156

@@ -152,7 +159,8 @@ mcxw71_k32w1_executable("lock_app") {
152159
}
153160

154161
if (chip_with_factory_data == 1) {
155-
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
162+
include_dirs +=
163+
[ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
156164
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
157165
}
158166

@@ -170,7 +178,7 @@ mcxw71_k32w1_executable("lock_app") {
170178

171179
if (chip_enable_ota_requestor) {
172180
defines += [
173-
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
181+
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
174182

175183
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
176184
"LED_MANAGER_ENABLE_STATUS_LED=0",
@@ -198,7 +206,6 @@ mcxw71_k32w1_executable("lock_app") {
198206
sources += [
199207
"${example_platform_dir}/button/ButtonManager.cpp",
200208
"${example_platform_dir}/clusters/Identify.cpp",
201-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
202209
]
203210

204211
if (chip_enable_ota_requestor) {

0 commit comments

Comments
 (0)