From 174410882d26a4a23308d4b0b82195dfd35736ef Mon Sep 17 00:00:00 2001 From: Sergei Lissianoi <54454955+selissia@users.noreply.github.com> Date: Thu, 16 Mar 2023 08:44:18 -0400 Subject: [PATCH] [Silabs] Do not call nvm3_repack() from the FreeRTOS idle hook (#25697) * Do not call nvm3_repack() from the idle hook * Include the Application Properties structure unconditionally * Update README files with bootloader info * Restyled by prettier-markdown --------- Co-authored-by: Restyled.io --- examples/light-switch-app/silabs/efr32/README.md | 5 +++++ examples/lighting-app/silabs/efr32/README.md | 5 +++++ examples/lock-app/silabs/efr32/README.md | 5 +++++ examples/platform/silabs/SiWx917/OTAConfig.cpp | 7 ------- examples/platform/silabs/SiWx917/matter_config.cpp | 3 --- examples/platform/silabs/efr32/OTAConfig.cpp | 7 ------- examples/platform/silabs/efr32/matter_config.cpp | 3 --- examples/thermostat/silabs/efr32/README.md | 5 +++++ examples/window-app/silabs/efr32/README.md | 5 +++++ 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/examples/light-switch-app/silabs/efr32/README.md b/examples/light-switch-app/silabs/efr32/README.md index 7d1eceee613bcf..67ec5bcd5cb692 100644 --- a/examples/light-switch-app/silabs/efr32/README.md +++ b/examples/light-switch-app/silabs/efr32/README.md @@ -166,6 +166,11 @@ arguments - Or with the Ozone debugger, just load the .out file. +All EFR32 boards require a bootloader, see Silicon Labs documentation for more +info. Pre-built bootloader binaries are available in the Assets section of the +Releases page on +[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) . + ## Viewing Logging Output The example application is built to use the SEGGER Real Time Transfer (RTT) diff --git a/examples/lighting-app/silabs/efr32/README.md b/examples/lighting-app/silabs/efr32/README.md index 92aeb9f5d1897d..2d9fe56590d115 100644 --- a/examples/lighting-app/silabs/efr32/README.md +++ b/examples/lighting-app/silabs/efr32/README.md @@ -158,6 +158,11 @@ arguments - Or with the Ozone debugger, just load the .out file. +All EFR32 boards require a bootloader, see Silicon Labs documentation for more +info. Pre-built bootloader binaries are available in the Assets section of the +Releases page on +[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) . + ## Viewing Logging Output The example application is built to use the SEGGER Real Time Transfer (RTT) diff --git a/examples/lock-app/silabs/efr32/README.md b/examples/lock-app/silabs/efr32/README.md index e3c7b86367573c..ec3c49e47961a0 100644 --- a/examples/lock-app/silabs/efr32/README.md +++ b/examples/lock-app/silabs/efr32/README.md @@ -177,6 +177,11 @@ arguments - Or with the Ozone debugger, just load the .out file. +All EFR32 boards require a bootloader, see Silicon Labs documentation for more +info. Pre-built bootloader binaries are available in the Assets section of the +Releases page on +[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) . + ## Viewing Logging Output The example application is built to use the SEGGER Real Time Transfer (RTT) diff --git a/examples/platform/silabs/SiWx917/OTAConfig.cpp b/examples/platform/silabs/SiWx917/OTAConfig.cpp index 1056cf5a3533b4..91c84054220b9c 100644 --- a/examples/platform/silabs/SiWx917/OTAConfig.cpp +++ b/examples/platform/silabs/SiWx917/OTAConfig.cpp @@ -21,12 +21,6 @@ #include "application_properties.h" #include -#if defined(SL_COMPONENT_CATALOG_PRESENT) -#include "sl_component_catalog.h" -#endif - -// Only include app properties if the Gecko SDK component that does it automatically isn't present -#if !defined(SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT) // Header used for building the image GBL file #define APP_PROPERTIES_VERSION 1 #define APP_PROPERTIES_ID \ @@ -71,7 +65,6 @@ __attribute__((used)) ApplicationProperties_t sl_app_properties = { /// Pointer to Long Token Data Section .longTokenSectionAddress = NULL, }; -#endif // SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT // Global OTA objects chip::DefaultOTARequestor gRequestorCore; diff --git a/examples/platform/silabs/SiWx917/matter_config.cpp b/examples/platform/silabs/SiWx917/matter_config.cpp index 94d4dacfe512d9..93c8d3250f9f25 100644 --- a/examples/platform/silabs/SiWx917/matter_config.cpp +++ b/examples/platform/silabs/SiWx917/matter_config.cpp @@ -177,7 +177,4 @@ void SI917MatterConfig::InitWiFi(void) extern "C" void vApplicationIdleHook(void) { // FreeRTOS Idle callback - - // Check CHIP Config nvm3 and repack flash if necessary. - Internal::SilabsConfig::RepackNvm3Flash(); } diff --git a/examples/platform/silabs/efr32/OTAConfig.cpp b/examples/platform/silabs/efr32/OTAConfig.cpp index 1056cf5a3533b4..91c84054220b9c 100644 --- a/examples/platform/silabs/efr32/OTAConfig.cpp +++ b/examples/platform/silabs/efr32/OTAConfig.cpp @@ -21,12 +21,6 @@ #include "application_properties.h" #include -#if defined(SL_COMPONENT_CATALOG_PRESENT) -#include "sl_component_catalog.h" -#endif - -// Only include app properties if the Gecko SDK component that does it automatically isn't present -#if !defined(SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT) // Header used for building the image GBL file #define APP_PROPERTIES_VERSION 1 #define APP_PROPERTIES_ID \ @@ -71,7 +65,6 @@ __attribute__((used)) ApplicationProperties_t sl_app_properties = { /// Pointer to Long Token Data Section .longTokenSectionAddress = NULL, }; -#endif // SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT // Global OTA objects chip::DefaultOTARequestor gRequestorCore; diff --git a/examples/platform/silabs/efr32/matter_config.cpp b/examples/platform/silabs/efr32/matter_config.cpp index 6c90eb9308415b..b530d5aa934f38 100644 --- a/examples/platform/silabs/efr32/matter_config.cpp +++ b/examples/platform/silabs/efr32/matter_config.cpp @@ -249,7 +249,4 @@ void EFR32MatterConfig::InitWiFi(void) extern "C" void vApplicationIdleHook(void) { // FreeRTOS Idle callback - - // Check CHIP Config nvm3 and repack flash if necessary. - Internal::SilabsConfig::RepackNvm3Flash(); } diff --git a/examples/thermostat/silabs/efr32/README.md b/examples/thermostat/silabs/efr32/README.md index 78da8934d12e28..8d98f44e8b498b 100644 --- a/examples/thermostat/silabs/efr32/README.md +++ b/examples/thermostat/silabs/efr32/README.md @@ -166,6 +166,11 @@ arguments - Or with the Ozone debugger, just load the .out file. +All EFR32 boards require a bootloader, see Silicon Labs documentation for more +info. Pre-built bootloader binaries are available in the Assets section of the +Releases page on +[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) . + ## Viewing Logging Output The example application is built to use the SEGGER Real Time Transfer (RTT) diff --git a/examples/window-app/silabs/efr32/README.md b/examples/window-app/silabs/efr32/README.md index b44c5e07e41ec2..838e90e4feb605 100644 --- a/examples/window-app/silabs/efr32/README.md +++ b/examples/window-app/silabs/efr32/README.md @@ -155,6 +155,11 @@ arguments - Or with the Ozone debugger, just load the .out file. +All EFR32 boards require a bootloader, see Silicon Labs documentation for more +info. Pre-built bootloader binaries are available in the Assets section of the +Releases page on +[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) . + ## Viewing Logging Output The example application is built to use the SEGGER Real Time Transfer (RTT)