From f9d2058d71d96ff039b8efa4f0806be585658e50 Mon Sep 17 00:00:00 2001 From: Andrei Menzopol Date: Thu, 20 Feb 2025 19:22:22 +0200 Subject: [PATCH 1/3] [nxp][platform][common] Remove FactoryDataProviderImpl header The PLATFORM_FACTORY_DATA_PROVIDER_IMPL_HEADER macro is set in e different source_set (nxp_factory_data) than nxp_ota where it is used (OTAFactoryDataProcessor.cpp) so it doesn't compile. However FactoryDataProviderImpl is not used in OTAFactoryDataProcessor.cpp so it can be removed. Signed-off-by: Andrei Menzopol --- src/platform/nxp/common/ota/OTAFactoryDataProcessor.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h b/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h index 570a33ceed5924..597f594feb4497 100644 --- a/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h +++ b/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h @@ -24,12 +24,10 @@ #include #include #include -#include PLATFORM_FACTORY_DATA_PROVIDER_IMPL_HEADER namespace chip { using FactoryProvider = DeviceLayer::FactoryDataProvider; -using FactoryProviderImpl = DeviceLayer::FactoryDataProviderImpl; using FactoryDataDriver = DeviceLayer::FactoryDataDriver; using Tags = FactoryProvider::FactoryDataId; From b8a2a1f9aea065d3189e4404173ef2c8954323f8 Mon Sep 17 00:00:00 2001 From: Andrei Menzopol Date: Thu, 20 Feb 2025 19:28:34 +0200 Subject: [PATCH 2/3] [nxp][platform][mcxw71] Remove FactoryDataProviderImpl header The PLATFORM_FACTORY_DATA_PROVIDER_IMPL_HEADER macro is set in e different source_set (nxp_factory_data) than nxp_ota where it is used (OTAFactoryDataProcessor.cpp) so it doesn't compile. However FactoryDataProviderImpl is not used in OTAFactoryDataProcessor.cpp so it can be removed. Signed-off-by: Andrei Menzopol --- src/platform/nxp/mcxw71_k32w1/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/platform/nxp/mcxw71_k32w1/BUILD.gn b/src/platform/nxp/mcxw71_k32w1/BUILD.gn index df4a711f691371..d23295535f00c6 100644 --- a/src/platform/nxp/mcxw71_k32w1/BUILD.gn +++ b/src/platform/nxp/mcxw71_k32w1/BUILD.gn @@ -43,8 +43,6 @@ source_set("nxp_factory_data") { "${chip_root}/src/credentials/CertificationDeclaration.h", ] - defines = [ "PLATFORM_FACTORY_DATA_PROVIDER_IMPL_HEADER=\"platform/nxp/common/factory_data/legacy/FactoryDataProviderImpl.h\"" ] - deps = [ ":nxp_platform", "${chip_root}/src/credentials:credentials", From 1cae9343478c84d0345898a067bf313f2c3903c7 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 21 Feb 2025 11:22:16 +0000 Subject: [PATCH 3/3] Restyled by clang-format --- src/platform/nxp/common/ota/OTAFactoryDataProcessor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h b/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h index 597f594feb4497..9865b2a31fbd00 100644 --- a/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h +++ b/src/platform/nxp/common/ota/OTAFactoryDataProcessor.h @@ -27,9 +27,9 @@ namespace chip { -using FactoryProvider = DeviceLayer::FactoryDataProvider; -using FactoryDataDriver = DeviceLayer::FactoryDataDriver; -using Tags = FactoryProvider::FactoryDataId; +using FactoryProvider = DeviceLayer::FactoryDataProvider; +using FactoryDataDriver = DeviceLayer::FactoryDataDriver; +using Tags = FactoryProvider::FactoryDataId; /** * OTA custom payload that uses Matter TLVs.