Skip to content

Commit

Permalink
Fix for multi-fabric for efr32 (#11979)
Browse files Browse the repository at this point in the history
* Increase heap

* Moved kvs count to be board specific
  • Loading branch information
mkardous-silabs authored and pull[bot] committed Nov 20, 2021
1 parent 5d2a425 commit 2011906
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion examples/lighting-app/efr32/include/FreeRTOSConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
#define configENABLE_BACKWARD_COMPATIBILITY (1)
#define configSUPPORT_STATIC_ALLOCATION (1)
#define configSUPPORT_DYNAMIC_ALLOCATION (1)
#define configTOTAL_HEAP_SIZE ((size_t)(16 * 1024))
#define configTOTAL_HEAP_SIZE ((size_t)(20 * 1024))

/* Optional functions - most linkers will remove unused functions anyway. */
#define INCLUDE_vTaskPrioritySet (1)
Expand Down
8 changes: 6 additions & 2 deletions third_party/efr32_sdk/efr32_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ template("efr32_sdk") {
"${efr32_mcu}=1",
"${efr32_board}=1",
"SL_SUPRESS_DEPRECATION_WARNINGS_SDK_3_1",
"CHIP_KVS_SECTOR_COUNT=4",
"CHIP_KVS_BASE_SECTOR_INDEX=((FLASH_SIZE/FLASH_PAGE_SIZE)-(CHIP_KVS_SECTOR_COUNT))",
"CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI=1",
"__HEAP_SIZE=0",
Expand Down Expand Up @@ -164,7 +163,10 @@ template("efr32_sdk") {
"${efr32_sdk_root}/platform/emdrv/nvm3/lib/libnvm3_CM4_gcc.a",
]

defines += [ "EFR32MG12" ]
defines += [
"EFR32MG12",
"CHIP_KVS_SECTOR_COUNT=6",
]
} else if (efr32_family == "efr32mg21") {
_include_dirs += [
"${efr32_sdk_root}/hardware/driver/memlcd/inc/memlcd_usart",
Expand All @@ -187,6 +189,7 @@ template("efr32_sdk") {
defines += [
"EFR32MG21",
"EFR32_SERIES2_CONFIG1_MICRO",
"CHIP_KVS_SECTOR_COUNT=4",
]
} else if (efr32_family == "efr32mg24") {
_include_dirs += [
Expand All @@ -210,6 +213,7 @@ template("efr32_sdk") {
defines += [
"EFR32MG24",
"EFR32_SERIES2_CONFIG4_MICRO",
"CHIP_KVS_SECTOR_COUNT=4",
]
}

Expand Down

0 comments on commit 2011906

Please sign in to comment.