[NXP][platform][common] Minor platform code updates (#36169)

* [NXP][platform][common] Platform code updates Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com> * Restyled by clang-format * [NXP] Fix include order after clang format Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com> --------- Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Oct 22, 2024 · 5eb3cc0 · 5eb3cc0
1 parent 4269ff5
commit 5eb3cc0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/examples/platform/nxp/common/ota_requestor/include/OTARequestorInitiator.h b/examples/platform/nxp/common/ota_requestor/include/OTARequestorInitiator.h
@@ -27,11 +27,11 @@
 #ifdef CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER
 #include CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER
 #else
-#ifdef CONFIG_CHIP
+#ifndef CONFIG_APP_FREERTOS_OS
 #include <platform/nxp/zephyr/ota/OTAImageProcessorImpl.h>
 #else
 #include "platform/nxp/common/OTAImageProcessorImpl.h"
-#endif /* CONFIG_CHIP */
+#endif /* CONFIG_APP_FREERTOS_OS */
 #endif /* CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER */
 
 #include <stdint.h>

diff --git a/src/platform/nxp/common/NXPConfigNVS.cpp b/src/platform/nxp/common/NXPConfigNVS.cpp
@@ -24,7 +24,7 @@
 #include <settings.h>
 
 /* Only for flash init, to be move to sdk framework */
-#include "port/nvs_port.h"
+#include "nvs_port.h"
 #if (CHIP_DEVICE_CONFIG_KVS_WEAR_STATS == 1)
 #include "fwk_nvs_stats.h"
 #endif /* CHIP_DEVICE_CONFIG_KVS_WEAR_STATS */

diff --git a/src/platform/nxp/common/ble_zephyr/BLEAdvertisingArbiter.h b/src/platform/nxp/common/ble_zephyr/BLEAdvertisingArbiter.h
@@ -20,7 +20,8 @@
 #include <lib/support/Span.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/sys/slist.h>
+
+#include <sys/slist.h>
 
 #include <cstdint>
 

diff --git a/src/platform/nxp/rt/rw61x/PlatformManagerImpl.cpp b/src/platform/nxp/rt/rw61x/PlatformManagerImpl.cpp
@@ -38,7 +38,7 @@
 
 #include <lwip/tcpip.h>
 
-#include MBEDTLS_PORT_INCLUDE
+#include "els_pkc_mbedtls.h"
 
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 #include "OtaSupport.h"