Skip to content

Commit 1085340

Browse files
selissiarestyled-commits
authored andcommitted
[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 <[email protected]>
1 parent 58f5ef8 commit 1085340

File tree

9 files changed

+25
-20
lines changed

9 files changed

+25
-20
lines changed

examples/light-switch-app/silabs/efr32/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ arguments
166166

167167
- Or with the Ozone debugger, just load the .out file.
168168

169+
All EFR32 boards require a bootloader, see Silicon Labs documentation for more
170+
info. Pre-built bootloader binaries are available in the Assets section of the
171+
Releases page on
172+
[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) .
173+
169174
## Viewing Logging Output
170175

171176
The example application is built to use the SEGGER Real Time Transfer (RTT)

examples/lighting-app/silabs/efr32/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@ arguments
158158

159159
- Or with the Ozone debugger, just load the .out file.
160160

161+
All EFR32 boards require a bootloader, see Silicon Labs documentation for more
162+
info. Pre-built bootloader binaries are available in the Assets section of the
163+
Releases page on
164+
[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) .
165+
161166
## Viewing Logging Output
162167

163168
The example application is built to use the SEGGER Real Time Transfer (RTT)

examples/lock-app/silabs/efr32/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,11 @@ arguments
177177

178178
- Or with the Ozone debugger, just load the .out file.
179179

180+
All EFR32 boards require a bootloader, see Silicon Labs documentation for more
181+
info. Pre-built bootloader binaries are available in the Assets section of the
182+
Releases page on
183+
[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) .
184+
180185
## Viewing Logging Output
181186

182187
The example application is built to use the SEGGER Real Time Transfer (RTT)

examples/platform/silabs/SiWx917/OTAConfig.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
#include "application_properties.h"
2222
#include <app/server/Server.h>
2323

24-
#if defined(SL_COMPONENT_CATALOG_PRESENT)
25-
#include "sl_component_catalog.h"
26-
#endif
27-
28-
// Only include app properties if the Gecko SDK component that does it automatically isn't present
29-
#if !defined(SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT)
3024
// Header used for building the image GBL file
3125
#define APP_PROPERTIES_VERSION 1
3226
#define APP_PROPERTIES_ID \
@@ -71,7 +65,6 @@ __attribute__((used)) ApplicationProperties_t sl_app_properties = {
7165
/// Pointer to Long Token Data Section
7266
.longTokenSectionAddress = NULL,
7367
};
74-
#endif // SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT
7568

7669
// Global OTA objects
7770
chip::DefaultOTARequestor gRequestorCore;

examples/platform/silabs/SiWx917/matter_config.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,4 @@ void SI917MatterConfig::InitWiFi(void)
177177
extern "C" void vApplicationIdleHook(void)
178178
{
179179
// FreeRTOS Idle callback
180-
181-
// Check CHIP Config nvm3 and repack flash if necessary.
182-
Internal::SilabsConfig::RepackNvm3Flash();
183180
}

examples/platform/silabs/efr32/OTAConfig.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
#include "application_properties.h"
2222
#include <app/server/Server.h>
2323

24-
#if defined(SL_COMPONENT_CATALOG_PRESENT)
25-
#include "sl_component_catalog.h"
26-
#endif
27-
28-
// Only include app properties if the Gecko SDK component that does it automatically isn't present
29-
#if !defined(SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT)
3024
// Header used for building the image GBL file
3125
#define APP_PROPERTIES_VERSION 1
3226
#define APP_PROPERTIES_ID \
@@ -71,7 +65,6 @@ __attribute__((used)) ApplicationProperties_t sl_app_properties = {
7165
/// Pointer to Long Token Data Section
7266
.longTokenSectionAddress = NULL,
7367
};
74-
#endif // SL_CATALOG_GECKO_BOOTLOADER_INTERFACE_PRESENT
7568

7669
// Global OTA objects
7770
chip::DefaultOTARequestor gRequestorCore;

examples/platform/silabs/efr32/matter_config.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,4 @@ void EFR32MatterConfig::InitWiFi(void)
249249
extern "C" void vApplicationIdleHook(void)
250250
{
251251
// FreeRTOS Idle callback
252-
253-
// Check CHIP Config nvm3 and repack flash if necessary.
254-
Internal::SilabsConfig::RepackNvm3Flash();
255252
}

examples/thermostat/silabs/efr32/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ arguments
166166

167167
- Or with the Ozone debugger, just load the .out file.
168168

169+
All EFR32 boards require a bootloader, see Silicon Labs documentation for more
170+
info. Pre-built bootloader binaries are available in the Assets section of the
171+
Releases page on
172+
[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) .
173+
169174
## Viewing Logging Output
170175

171176
The example application is built to use the SEGGER Real Time Transfer (RTT)

examples/window-app/silabs/efr32/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ arguments
155155

156156
- Or with the Ozone debugger, just load the .out file.
157157

158+
All EFR32 boards require a bootloader, see Silicon Labs documentation for more
159+
info. Pre-built bootloader binaries are available in the Assets section of the
160+
Releases page on
161+
[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) .
162+
158163
## Viewing Logging Output
159164

160165
The example application is built to use the SEGGER Real Time Transfer (RTT)

0 commit comments

Comments
 (0)