From a4612073703b81a826b4f1600376c5a289676d2f Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Tue, 16 Jan 2024 16:01:12 +0530 Subject: [PATCH 1/2] [ESP32] Implement GetSupportedWiFiBandsMask() API (#31437) --- src/platform/ESP32/NetworkCommissioningDriver.cpp | 6 ++++++ src/platform/ESP32/NetworkCommissioningDriver.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/platform/ESP32/NetworkCommissioningDriver.cpp b/src/platform/ESP32/NetworkCommissioningDriver.cpp index 80e54d74803e7e..2871c4c3f2031d 100644 --- a/src/platform/ESP32/NetworkCommissioningDriver.cpp +++ b/src/platform/ESP32/NetworkCommissioningDriver.cpp @@ -433,6 +433,12 @@ void ESPWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callb } } +uint32_t ESPWiFiDriver::GetSupportedWiFiBandsMask() const +{ + uint32_t bands = static_cast(1UL << chip::to_underlying(WiFiBandEnum::k2g4)); + return bands; +} + CHIP_ERROR ESPWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event) { VerifyOrReturnError(event->Type == DeviceEventType::kESPSystemEvent && event->Platform.ESPSystemEvent.Base == WIFI_EVENT && diff --git a/src/platform/ESP32/NetworkCommissioningDriver.h b/src/platform/ESP32/NetworkCommissioningDriver.h index 5a2ca8f44d61c1..447d6346dcbd1c 100644 --- a/src/platform/ESP32/NetworkCommissioningDriver.h +++ b/src/platform/ESP32/NetworkCommissioningDriver.h @@ -112,6 +112,7 @@ class ESPWiFiDriver final : public WiFiDriver Status AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override; void ScanNetworks(ByteSpan ssid, ScanCallback * callback) override; + uint32_t GetSupportedWiFiBandsMask() const override; CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen); void OnConnectWiFiNetwork(); From 943b870f7270992a1c404596a4afe98e6581cce7 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 16 Jan 2024 06:58:13 -0500 Subject: [PATCH 2/2] [Telink] Remove define of CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER. (#31390) * Remove define of CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER. This define should not be at a platform level and should only be pulled in via dependencies. * [Telink] Fix build * [Telink] Remove CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER from all CMake files * [Telink] Needs BOOTLOADER_MCUBOOT for DFU without Matter OTA --------- Co-authored-by: Andrii Bilynskyi Co-authored-by: Alex Tsitsiura --- config/telink/chip-module/CMakeLists.txt | 1 - .../air-quality-sensor-app/telink/CMakeLists.txt | 8 ++++---- examples/all-clusters-app/telink/CMakeLists.txt | 8 ++++---- .../all-clusters-minimal-app/telink/CMakeLists.txt | 8 ++++---- examples/bridge-app/telink/CMakeLists.txt | 9 ++++----- examples/chef/telink/CMakeLists.txt | 8 ++++---- examples/contact-sensor-app/telink/CMakeLists.txt | 8 ++++---- examples/light-switch-app/telink/CMakeLists.txt | 8 ++++---- examples/lighting-app/telink/CMakeLists.txt | 8 ++++---- examples/lock-app/telink/CMakeLists.txt | 8 ++++---- examples/ota-requestor-app/telink/CMakeLists.txt | 8 ++++---- .../platform/telink/common/src/AppTaskCommon.cpp | 12 ++++++++++++ .../platform/telink/util/include}/OTAUtil.h | 0 .../platform/telink/util/src}/OTAUtil.cpp | 0 examples/pump-app/telink/CMakeLists.txt | 8 ++++---- examples/pump-controller-app/telink/CMakeLists.txt | 8 ++++---- examples/shell/telink/CMakeLists.txt | 8 ++++---- examples/smoke-co-alarm-app/telink/CMakeLists.txt | 8 ++++---- .../telink/CMakeLists.txt | 8 ++++---- examples/thermostat/telink/CMakeLists.txt | 8 ++++---- examples/window-app/telink/CMakeLists.txt | 8 ++++---- src/platform/telink/BLEManagerImpl.h | 7 ------- src/platform/telink/BUILD.gn | 9 --------- src/platform/telink/args.gni | 3 --- 24 files changed, 80 insertions(+), 89 deletions(-) rename {src/platform/telink => examples/platform/telink/util/include}/OTAUtil.h (100%) rename {src/platform/telink => examples/platform/telink/util/src}/OTAUtil.cpp (100%) diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt index f9f4b933cccf5d..418dbc07e0ba0b 100644 --- a/config/telink/chip-module/CMakeLists.txt +++ b/config/telink/chip-module/CMakeLists.txt @@ -97,7 +97,6 @@ matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT) matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_NET_IPV4) matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING) matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR) -matter_add_gn_arg_bool ("chip_enable_bootloader_mcuboot" CONFIG_BOOTLOADER_MCUBOOT) matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS) matter_add_gn_arg_bool ("chip_error_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1) matter_add_gn_arg_bool ("chip_progress_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3) diff --git a/examples/air-quality-sensor-app/telink/CMakeLists.txt b/examples/air-quality-sensor-app/telink/CMakeLists.txt index 908bea9eb73a98..5ed8c314f1b334 100644 --- a/examples/air-quality-sensor-app/telink/CMakeLists.txt +++ b/examples/air-quality-sensor-app/telink/CMakeLists.txt @@ -86,10 +86,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${CHIP_ROOT}/examples/air-quality-sensor-app/air-quality-sensor-common/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -107,3 +103,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../air-quality-sensor-common/air-quality-sensor-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/all-clusters-app/telink/CMakeLists.txt b/examples/all-clusters-app/telink/CMakeLists.txt index 7448fd76c4d91f..3571869e8949aa 100644 --- a/examples/all-clusters-app/telink/CMakeLists.txt +++ b/examples/all-clusters-app/telink/CMakeLists.txt @@ -72,10 +72,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/common/include ${TELINK_COMMON}/util/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/smco-stub.cpp @@ -101,3 +97,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/all-clusters-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/all-clusters-minimal-app/telink/CMakeLists.txt b/examples/all-clusters-minimal-app/telink/CMakeLists.txt index a7bb51ba0e67fe..a68471e379a842 100644 --- a/examples/all-clusters-minimal-app/telink/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/telink/CMakeLists.txt @@ -70,10 +70,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/common/include ${TELINK_COMMON}/util/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/smco-stub.cpp @@ -90,3 +86,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-minimal-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/bridge-app/telink/CMakeLists.txt b/examples/bridge-app/telink/CMakeLists.txt index 1b65dc3bf543e7..f4da959953def8 100644 --- a/examples/bridge-app/telink/CMakeLists.txt +++ b/examples/bridge-app/telink/CMakeLists.txt @@ -69,11 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" - -DCHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT=16 -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -90,3 +85,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../bridge-common/bridge-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/chef/telink/CMakeLists.txt b/examples/chef/telink/CMakeLists.txt index 7722f26a11d96e..5d30d424ea3dfd 100755 --- a/examples/chef/telink/CMakeLists.txt +++ b/examples/chef/telink/CMakeLists.txt @@ -92,10 +92,6 @@ if (CONFIG_CHIP_LIB_SHELL) ) endif() -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp ${TELINK_COMMON}/common/src/mainCommon.cpp @@ -113,6 +109,10 @@ chip_configure_data_model(app ZAP_FILE ${CHEF}/devices/${SAMPLE_NAME}.zap ) +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() + if (CONFIG_CHIP_PW_RPC) # Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags diff --git a/examples/contact-sensor-app/telink/CMakeLists.txt b/examples/contact-sensor-app/telink/CMakeLists.txt index 128d7afbf89744..c29ef949914036 100755 --- a/examples/contact-sensor-app/telink/CMakeLists.txt +++ b/examples/contact-sensor-app/telink/CMakeLists.txt @@ -68,10 +68,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/common/include ${TELINK_COMMON}/util/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ContactSensorManager.cpp @@ -87,3 +83,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../contact-sensor-common/contact-sensor-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/light-switch-app/telink/CMakeLists.txt b/examples/light-switch-app/telink/CMakeLists.txt index dd2bfed8dae203..5dd8720ce8d59f 100755 --- a/examples/light-switch-app/telink/CMakeLists.txt +++ b/examples/light-switch-app/telink/CMakeLists.txt @@ -69,10 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -89,6 +85,10 @@ chip_configure_data_model(app ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../light-switch-common/light-switch-app.zap ) +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() + # Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70 add_compile_options(-Wno-error=unused-parameter) diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt index 2a7e46fc3d8076..2017d797558eb6 100644 --- a/examples/lighting-app/telink/CMakeLists.txt +++ b/examples/lighting-app/telink/CMakeLists.txt @@ -101,10 +101,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -122,6 +118,10 @@ chip_configure_data_model(app ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap ) +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() + # Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70 add_compile_options(-Wno-error=unused-parameter) diff --git a/examples/lock-app/telink/CMakeLists.txt b/examples/lock-app/telink/CMakeLists.txt index 70ac496507afe7..58a9e4fb5bab8f 100755 --- a/examples/lock-app/telink/CMakeLists.txt +++ b/examples/lock-app/telink/CMakeLists.txt @@ -69,10 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -89,3 +85,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lock-common/lock-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/ota-requestor-app/telink/CMakeLists.txt b/examples/ota-requestor-app/telink/CMakeLists.txt index 81c559cfa73127..31be460d8a346c 100644 --- a/examples/ota-requestor-app/telink/CMakeLists.txt +++ b/examples/ota-requestor-app/telink/CMakeLists.txt @@ -69,10 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -87,3 +83,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../ota-requestor-common/ota-requestor-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp index 1ba800e5e1bcf0..a77f4363df65f5 100644 --- a/examples/platform/telink/common/src/AppTaskCommon.cpp +++ b/examples/platform/telink/common/src/AppTaskCommon.cpp @@ -30,6 +30,10 @@ #include #include +#if CONFIG_BOOTLOADER_MCUBOOT +#include +#endif + #if CONFIG_CHIP_OTA_REQUESTOR #include #endif @@ -246,6 +250,14 @@ CHIP_ERROR AppTaskCommon::StartApp(void) StartThreadButtonEventHandler(); #endif +#ifdef CONFIG_BOOTLOADER_MCUBOOT + if (!chip::DeviceLayer::ConnectivityMgr().IsThreadProvisioned()) + { + LOG_INF("Confirm image."); + OtaConfirmNewImage(); + } +#endif /* CONFIG_BOOTLOADER_MCUBOOT */ + while (true) { GetEvent(&event); diff --git a/src/platform/telink/OTAUtil.h b/examples/platform/telink/util/include/OTAUtil.h similarity index 100% rename from src/platform/telink/OTAUtil.h rename to examples/platform/telink/util/include/OTAUtil.h diff --git a/src/platform/telink/OTAUtil.cpp b/examples/platform/telink/util/src/OTAUtil.cpp similarity index 100% rename from src/platform/telink/OTAUtil.cpp rename to examples/platform/telink/util/src/OTAUtil.cpp diff --git a/examples/pump-app/telink/CMakeLists.txt b/examples/pump-app/telink/CMakeLists.txt index 8d42d5f79762c5..5c3ad5d3d3f41e 100755 --- a/examples/pump-app/telink/CMakeLists.txt +++ b/examples/pump-app/telink/CMakeLists.txt @@ -69,10 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/PumpManager.cpp @@ -87,3 +83,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../pump-common/pump-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/pump-controller-app/telink/CMakeLists.txt b/examples/pump-controller-app/telink/CMakeLists.txt index dca66f8dd31702..684bb89776eed5 100755 --- a/examples/pump-controller-app/telink/CMakeLists.txt +++ b/examples/pump-controller-app/telink/CMakeLists.txt @@ -69,10 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/PumpManager.cpp @@ -87,3 +83,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../pump-controller-common/pump-controller-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/shell/telink/CMakeLists.txt b/examples/shell/telink/CMakeLists.txt index 0bd2d490411bec..c5cb3eb65be136 100755 --- a/examples/shell/telink/CMakeLists.txt +++ b/examples/shell/telink/CMakeLists.txt @@ -66,12 +66,12 @@ target_include_directories(app PRIVATE ${GEN_DIR}/app-common ${APP_ROOT}/shell_common/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE ${APP_ROOT}/shell_common/globals.cpp ${APP_ROOT}/shell_common/cmd_misc.cpp ${APP_ROOT}/shell_common/cmd_otcli.cpp ${APP_ROOT}/standalone/main.cpp) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/smoke-co-alarm-app/telink/CMakeLists.txt b/examples/smoke-co-alarm-app/telink/CMakeLists.txt index e916aa52f9425b..96cb66c2ac19e7 100755 --- a/examples/smoke-co-alarm-app/telink/CMakeLists.txt +++ b/examples/smoke-co-alarm-app/telink/CMakeLists.txt @@ -68,10 +68,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/common/include ${TELINK_COMMON}/util/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/SmokeCoAlarmManager.cpp @@ -87,3 +83,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../smoke-co-alarm-common/smoke-co-alarm-app.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/temperature-measurement-app/telink/CMakeLists.txt b/examples/temperature-measurement-app/telink/CMakeLists.txt index e409b2e2bc59de..fe847592ed985f 100644 --- a/examples/temperature-measurement-app/telink/CMakeLists.txt +++ b/examples/temperature-measurement-app/telink/CMakeLists.txt @@ -85,10 +85,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/app/include ) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp ${TELINK_COMMON}/common/src/mainCommon.cpp @@ -104,3 +100,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../temperature-measurement-common/temperature-measurement.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/thermostat/telink/CMakeLists.txt b/examples/thermostat/telink/CMakeLists.txt index 71f14895b28a55..d46ba248bd77bc 100755 --- a/examples/thermostat/telink/CMakeLists.txt +++ b/examples/thermostat/telink/CMakeLists.txt @@ -84,10 +84,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/TemperatureManager.cpp @@ -105,3 +101,7 @@ chip_configure_data_model(app INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../thermostat-common/thermostat.zap ) + +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() diff --git a/examples/window-app/telink/CMakeLists.txt b/examples/window-app/telink/CMakeLists.txt index 781e487c9a4ff6..629a0a06779dcc 100644 --- a/examples/window-app/telink/CMakeLists.txt +++ b/examples/window-app/telink/CMakeLists.txt @@ -69,10 +69,6 @@ target_include_directories(app PRIVATE ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) -add_definitions( - "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" -) - target_sources(app PRIVATE src/AppTask.cpp src/ZclCallbacks.cpp @@ -90,6 +86,10 @@ chip_configure_data_model(app ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../common/window-app.zap ) +if(CONFIG_BOOTLOADER_MCUBOOT) + target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp) +endif() + # Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70 add_compile_options(-Wno-error=unused-parameter) diff --git a/src/platform/telink/BLEManagerImpl.h b/src/platform/telink/BLEManagerImpl.h index 63e501eadaae7a..1e1c4c94d67638 100644 --- a/src/platform/telink/BLEManagerImpl.h +++ b/src/platform/telink/BLEManagerImpl.h @@ -33,10 +33,6 @@ #include #include -#ifdef CONFIG_BOOTLOADER_MCUBOOT -#include "OTAUtil.h" -#endif /* CONFIG_BOOTLOADER_MCUBOOT */ - namespace chip { namespace DeviceLayer { namespace Internal { @@ -186,9 +182,6 @@ class InternalScanCallback : public DeviceLayer::NetworkCommissioning::ThreadDri NetworkCommissioning::ThreadScanResponseIterator * networks) { mBLEManagerImpl->StartAdvertisingProcess(); -#ifdef CONFIG_BOOTLOADER_MCUBOOT - OtaConfirmNewImage(); -#endif /* CONFIG_BOOTLOADER_MCUBOOT */ }; private: diff --git a/src/platform/telink/BUILD.gn b/src/platform/telink/BUILD.gn index ec645d1773ce9f..5561fb4e906ac9 100644 --- a/src/platform/telink/BUILD.gn +++ b/src/platform/telink/BUILD.gn @@ -60,8 +60,6 @@ static_library("telink") { public_deps = [ "${chip_root}/src/platform:platform_base" ] deps = [ "${chip_root}/src/platform/logging:headers" ] - defines = [ "CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" ] - if (chip_enable_factory_data) { sources += [ "FactoryDataParser.c", @@ -94,11 +92,4 @@ static_library("telink") { "OTAImageProcessorImpl.h", ] } - - if (chip_enable_bootloader_mcuboot) { - sources += [ - "OTAUtil.cpp", - "OTAUtil.h", - ] - } } diff --git a/src/platform/telink/args.gni b/src/platform/telink/args.gni index 82197d9cecdbd4..8a0a79b3a59761 100644 --- a/src/platform/telink/args.gni +++ b/src/platform/telink/args.gni @@ -19,7 +19,4 @@ chip_inet_config_enable_ipv4 = false declare_args() { # Enable factory data support chip_enable_factory_data = false - - # Enable Zephyr application to be booted by MCUboot - chip_enable_bootloader_mcuboot = false }