Skip to content

Commit 94c7874

Browse files
Added gating of SILABS_LOG_ENABLED on chip_logging
1 parent def66f0 commit 94c7874

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

third_party/silabs/SiWx917_sdk.gni

+6-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ template("siwx917_sdk") {
166166
"MBEDTLS_CONFIG_FILE=\"siwx917-chip-mbedtls-config.h\"",
167167
"__STARTUP_CLEAR_BSS",
168168
"HARD_FAULT_LOG_ENABLE",
169-
"SILABS_LOG_ENABLED=${silabs_log_enabled}",
170169
"SL_HEAP_SIZE=32768",
171170
"SL_WIFI=1",
172171
"CCP_SI917_BRINGUP=1",
@@ -224,6 +223,12 @@ template("siwx917_sdk") {
224223
"configUSE_POSIX_ERRNO=1",
225224
]
226225

226+
if (silabs_log_enabled && chip_logging) {
227+
defines += [ "SILABS_LOG_ENABLED=1" ]
228+
} else {
229+
defines += [ "SILABS_LOG_ENABLED=0" ]
230+
}
231+
227232
if (chip_build_libshell) {
228233
defines += [ "ENABLE_CHIP_SHELL" ]
229234
}

third_party/silabs/efr32_sdk.gni

+6-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ template("efr32_sdk") {
283283
"__STARTUP_CLEAR_BSS",
284284
"HARD_FAULT_LOG_ENABLE",
285285
"CORTEXM3_EFM32_MICRO",
286-
"SILABS_LOG_ENABLED=${silabs_log_enabled}",
287286
"NVM3_DEFAULT_NVM_SIZE=40960",
288287
"NVM3_DEFAULT_MAX_OBJECT_SIZE=4092",
289288
"KVS_MAX_ENTRIES=${kvs_max_entries}",
@@ -308,6 +307,12 @@ template("efr32_sdk") {
308307
#"__STACK_SIZE=0",
309308
]
310309

310+
if (silabs_log_enabled && chip_logging) {
311+
defines += [ "SILABS_LOG_ENABLED=1" ]
312+
} else {
313+
defines += [ "SILABS_LOG_ENABLED=0" ]
314+
}
315+
311316
# Temporary configuration to enable COAP specific configurations
312317
if (use_thread_coap_lib) {
313318
defines += [ "SL_USE_COAP_CONFIG=1" ]

0 commit comments

Comments
 (0)