[nxp fromtree] [NXP] Move some components in common (project-chip#35594)

* [nxp][platform][common] Rename S200 crypto PAL and move it to common Signed-off-by: marius-alex-tache <[email protected]> * [nxp][examples][common] Make S200 Operational Keystore common Signed-off-by: marius-alex-tache <[email protected]> * [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 <[email protected]> * [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 <[email protected]> * [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 <[email protected]> * [nxp][platform][k32w0] Update files after moving some components Signed-off-by: marius-alex-tache <[email protected]> * [nxp][mcxw71_k32w1] Update build system after moving some components Signed-off-by: marius-alex-tache <[email protected]> * [nxp][examples][k32w0] Update build system after moving some components Signed-off-by: marius-alex-tache <[email protected]> * [nxp][scripts][common] Update list of supported devices for multi-image OTA Signed-off-by: marius-alex-tache <[email protected]> * [nxp] Bump nxp_matter_support Signed-off-by: marius-alex-tache <[email protected]> * [nxp][mcxw71_k32w1][lock-app] Update build system after moving some components Signed-off-by: marius-alex-tache <[email protected]> * [nxp][mcxw71_k32w1] Fix factory data compilation issue Signed-off-by: Doru Gucea <[email protected]> * Restyled by gn * [nxp][ota] Fix spelling of platforms Signed-off-by: marius-alex-tache <[email protected]> * 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 <[email protected]> --------- Signed-off-by: marius-alex-tache <[email protected]> Signed-off-by: Doru Gucea <[email protected]> Signed-off-by: Marius Tache <[email protected]> Co-authored-by: Doru Gucea <[email protected]> Co-authored-by: Restyled.io <[email protected]> (cherry picked from commit 89c8d33)
NXP · Sep 18, 2024 · a704832 · a704832
1 parent 87df5d1
commit a704832
Show file tree

Hide file tree

Showing 50 changed files with 214 additions and 401 deletions.
diff --git a/examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp b/examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp
@@ -42,7 +42,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <src/platform/nxp/common/legacy/OTAImageProcessorImpl.h>
+#include <src/platform/nxp/common/ota/OTAImageProcessorImpl.h>
 #endif
 
 #include <src/platform/nxp/k32w0/BLEManagerImpl.h>

diff --git a/examples/contact-sensor-app/nxp/k32w1/BUILD.gn b/examples/contact-sensor-app/nxp/k32w1/BUILD.gn
@@ -39,6 +39,8 @@ assert(target_os == "freertos")
 
 example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
+support_common_platform_dir =
+    "${nxp_sdk_matter_support_root}/examples/platform/common"
 
 mcxw71_k32w1_sdk("sdk") {
   defines = []
@@ -54,6 +56,9 @@ mcxw71_k32w1_sdk("sdk") {
   # Indicate the default path to OpenThreadConfig.h
   include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
 
+  # Indicate the default path to GATT database
+  include_dirs += [ "${support_common_platform_dir}/ble" ]
+
   include_dirs += [
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
@@ -69,6 +74,7 @@ mcxw71_k32w1_sdk("sdk") {
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
+    "${support_common_platform_dir}/ble/ble_function_mux.c",
   ]
 
   if (is_debug) {
@@ -104,7 +110,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
     "CONFIG_NETWORK_LAYER_BLE=1",
     "CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
     "CONFIG_OPERATIONAL_KEYSTORE=1",
-    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
+    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
   ]
 
   if (chip_with_diag_logs_demo) {
@@ -141,6 +147,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",
     "${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
     "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
+    "${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
     "${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
   ]
 
@@ -149,19 +156,23 @@ mcxw71_k32w1_executable("contact_sensor_app") {
   }
 
   if (chip_with_factory_data == 1) {
-    include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
+    include_dirs +=
+        [ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
   }
 
   if (chip_enable_ota_requestor) {
     defines += [
-      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
+      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
 
       # The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
       "LED_MANAGER_ENABLE_STATUS_LED=0",
     ]
 
-    include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
+    include_dirs += [
+      "${common_example_dir}/ota_requestor/include",
+      "${chip_root}/src/platform/nxp/common/ota",
+    ]
     sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
   }
@@ -183,7 +194,6 @@ mcxw71_k32w1_executable("contact_sensor_app") {
   sources += [
     "${example_platform_dir}/button/ButtonManager.cpp",
     "${example_platform_dir}/clusters/Identify.cpp",
-    "${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
   ]
 
   if (chip_enable_ota_requestor) {

diff --git a/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn b/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn
@@ -38,6 +38,8 @@ assert(target_os == "freertos")
 
 example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
+support_common_platform_dir =
+    "${nxp_sdk_matter_support_root}/examples/platform/common"
 
 mcxw71_k32w1_sdk("sdk") {
   defines = []
@@ -53,6 +55,9 @@ mcxw71_k32w1_sdk("sdk") {
   # Indicate the default path to OpenThreadConfig.h
   include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
 
+  # Indicate the default path to GATT database
+  include_dirs += [ "${support_common_platform_dir}/ble" ]
+
   include_dirs += [
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/MCXW716C",
@@ -68,6 +73,7 @@ mcxw71_k32w1_sdk("sdk") {
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
+    "${support_common_platform_dir}/ble/ble_function_mux.c",
   ]
 
   if (is_debug) {
@@ -103,7 +109,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
     "CONFIG_NETWORK_LAYER_BLE=1",
     "CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
     "CONFIG_OPERATIONAL_KEYSTORE=1",
-    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
+    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
   ]
 
   if (chip_with_diag_logs_demo) {
@@ -140,6 +146,7 @@ mcxw71_k32w1_executable("contact_sensor_app") {
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",
     "${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
     "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
+    "${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
     "${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
   ]
 
@@ -148,19 +155,23 @@ mcxw71_k32w1_executable("contact_sensor_app") {
   }
 
   if (chip_with_factory_data == 1) {
-    include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
+    include_dirs +=
+        [ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
   }
 
   if (chip_enable_ota_requestor) {
     defines += [
-      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
+      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
 
       # The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
       "LED_MANAGER_ENABLE_STATUS_LED=0",
     ]
 
-    include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
+    include_dirs += [
+      "${common_example_dir}/ota_requestor/include",
+      "${chip_root}/src/platform/nxp/common/ota",
+    ]
     sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
   }
@@ -182,7 +193,6 @@ mcxw71_k32w1_executable("contact_sensor_app") {
   sources += [
     "${example_platform_dir}/button/ButtonManager.cpp",
     "${example_platform_dir}/clusters/Identify.cpp",
-    "${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
   ]
 
   if (chip_enable_ota_requestor) {

diff --git a/examples/lighting-app/nxp/k32w0/main/AppTask.cpp b/examples/lighting-app/nxp/k32w0/main/AppTask.cpp
@@ -43,7 +43,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <src/platform/nxp/common/legacy/OTAImageProcessorImpl.h>
+#include <src/platform/nxp/common/ota/OTAImageProcessorImpl.h>
 #endif
 
 #include "DefaultTestEventTriggerDelegate.h"

diff --git a/examples/lighting-app/nxp/k32w1/BUILD.gn b/examples/lighting-app/nxp/k32w1/BUILD.gn
@@ -44,6 +44,8 @@ assert(target_os == "freertos")
 
 example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
+support_common_platform_dir =
+    "${nxp_sdk_matter_support_root}/examples/platform/common"
 
 mcxw71_k32w1_sdk("sdk") {
   defines = []
@@ -59,6 +61,9 @@ mcxw71_k32w1_sdk("sdk") {
   # Indicate the default path to OpenThreadConfig.h
   include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
 
+  # Indicate the default path to GATT database
+  include_dirs += [ "${support_common_platform_dir}/ble" ]
+
   include_dirs += [
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
@@ -74,6 +79,7 @@ mcxw71_k32w1_sdk("sdk") {
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
+    "${support_common_platform_dir}/ble/ble_function_mux.c",
   ]
 
   if (is_debug) {
@@ -125,7 +131,7 @@ mcxw71_k32w1_executable("light_app") {
     "CONFIG_OPERATIONAL_KEYSTORE=1",
     "CONFIG_ENABLE_FEEDBACK=1",
     "APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)",
-    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
+    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
   ]
 
   # App common files
@@ -148,12 +154,13 @@ mcxw71_k32w1_executable("light_app") {
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",
     "${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
     "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
+    "${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
     "${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
   ]
 
   if (chip_enable_ota_requestor) {
     defines += [
-      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
+      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
 
       # The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
       "LED_MANAGER_ENABLE_STATUS_LED=0",
@@ -174,7 +181,6 @@ mcxw71_k32w1_executable("light_app") {
   sources += [
     "${example_platform_dir}/button/ButtonManager.cpp",
     "${example_platform_dir}/clusters/Identify.cpp",
-    "${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
   ]
 
   if (chip_enable_ota_requestor) {
@@ -186,7 +192,8 @@ mcxw71_k32w1_executable("light_app") {
   }
 
   if (chip_with_factory_data == 1) {
-    include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
+    include_dirs +=
+        [ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
   }
 

diff --git a/examples/lighting-app/nxp/mcxw71/BUILD.gn b/examples/lighting-app/nxp/mcxw71/BUILD.gn
@@ -44,6 +44,8 @@ assert(target_os == "freertos")
 
 example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
+support_common_platform_dir =
+    "${nxp_sdk_matter_support_root}/examples/platform/common"
 
 mcxw71_k32w1_sdk("sdk") {
   defines = []
@@ -59,6 +61,9 @@ mcxw71_k32w1_sdk("sdk") {
   # Indicate the default path to OpenThreadConfig.h
   include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
 
+  # Indicate the default path to GATT database
+  include_dirs += [ "${support_common_platform_dir}/ble" ]
+
   include_dirs += [
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/MCXW716C",
@@ -74,6 +79,7 @@ mcxw71_k32w1_sdk("sdk") {
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
+    "${support_common_platform_dir}/ble/ble_function_mux.c",
   ]
 
   if (is_debug) {
@@ -125,7 +131,7 @@ mcxw71_k32w1_executable("light_app") {
     "CONFIG_OPERATIONAL_KEYSTORE=1",
     "CONFIG_ENABLE_FEEDBACK=1",
     "APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)",
-    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
+    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
   ]
 
   # App common files
@@ -148,18 +154,22 @@ mcxw71_k32w1_executable("light_app") {
     "${common_example_dir}/clusters/source/ZclCallbacks.cpp",
     "${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
     "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
+    "${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
     "${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
   ]
 
   if (chip_enable_ota_requestor) {
     defines += [
-      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
+      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
 
       # The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
       "LED_MANAGER_ENABLE_STATUS_LED=0",
     ]
 
-    include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
+    include_dirs += [
+      "${common_example_dir}/ota_requestor/include",
+      "${chip_root}/src/platform/nxp/common/ota",
+    ]
     sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_ota" ]
   }
@@ -174,7 +184,6 @@ mcxw71_k32w1_executable("light_app") {
   sources += [
     "${example_platform_dir}/button/ButtonManager.cpp",
     "${example_platform_dir}/clusters/Identify.cpp",
-    "${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
   ]
 
   if (chip_enable_ota_requestor) {
@@ -186,7 +195,8 @@ mcxw71_k32w1_executable("light_app") {
   }
 
   if (chip_with_factory_data == 1) {
-    include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
+    include_dirs +=
+        [ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
   }
 

diff --git a/examples/lock-app/nxp/k32w1/BUILD.gn b/examples/lock-app/nxp/k32w1/BUILD.gn
@@ -37,6 +37,8 @@ assert(target_os == "freertos")
 
 example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
+support_common_platform_dir =
+    "${nxp_sdk_matter_support_root}/examples/platform/common"
 
 mcxw71_k32w1_sdk("sdk") {
   defines = []
@@ -52,6 +54,9 @@ mcxw71_k32w1_sdk("sdk") {
   # Indicate the default path to OpenThreadConfig.h
   include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
 
+  # Indicate the default path to GATT database
+  include_dirs += [ "${support_common_platform_dir}/ble" ]
+
   include_dirs += [
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
@@ -67,6 +72,7 @@ mcxw71_k32w1_sdk("sdk") {
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
     "${nxp_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
+    "${support_common_platform_dir}/ble/ble_function_mux.c",
   ]
 
   if (is_debug) {
@@ -102,7 +108,7 @@ mcxw71_k32w1_executable("lock_app") {
     "CONFIG_NETWORK_LAYER_BLE=1",
     "CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
     "CONFIG_OPERATIONAL_KEYSTORE=1",
-    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
+    "EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProvider.h\"",
     "CONFIG_APP_FREERTOS_OS=1",
   ]
 
@@ -144,6 +150,7 @@ mcxw71_k32w1_executable("lock_app") {
     "${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
     "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
     "${common_example_dir}/icd/source/ICDUtil.cpp",
+    "${common_example_dir}/operational_keystore/source/OperationalKeystoreS200.cpp",
     "${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
   ]
 
@@ -152,7 +159,8 @@ mcxw71_k32w1_executable("lock_app") {
   }
 
   if (chip_with_factory_data == 1) {
-    include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
+    include_dirs +=
+        [ "${chip_root}/src/platform/nxp/common/factory_data/legacy" ]
     deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
   }
 
@@ -170,7 +178,7 @@ mcxw71_k32w1_executable("lock_app") {
 
   if (chip_enable_ota_requestor) {
     defines += [
-      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
+      "CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/ota/OTAImageProcessorImpl.h\"",
 
       # The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
       "LED_MANAGER_ENABLE_STATUS_LED=0",
@@ -198,7 +206,6 @@ mcxw71_k32w1_executable("lock_app") {
   sources += [
     "${example_platform_dir}/button/ButtonManager.cpp",
     "${example_platform_dir}/clusters/Identify.cpp",
-    "${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
   ]
 
   if (chip_enable_ota_requestor) {