Skip to content

Commit 6889c3d

Browse files
Fixup missing define for the MCU family for ncp builds.
1 parent 5c4749d commit 6889c3d

File tree

1 file changed

+32
-24
lines changed

1 file changed

+32
-24
lines changed

third_party/silabs/efr32_sdk.gni

+32-24
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ template("efr32_sdk") {
138138
config("${sdk_target_name}_config") {
139139
include_dirs = []
140140
libs = []
141+
defines = []
142+
141143
if (defined(invoker.include_dirs)) {
142144
include_dirs += invoker.include_dirs
143145
}
@@ -267,6 +269,8 @@ template("efr32_sdk") {
267269
if (!chip_enable_ble_rs911x) {
268270
libs += [ "${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg24_gcc_release.a" ]
269271
}
272+
273+
defines += [ "EFR32MG24" ]
270274
} else if (silabs_family == "mgm24") {
271275
_include_dirs += [
272276
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Include",
@@ -289,6 +293,8 @@ template("efr32_sdk") {
289293
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240sd22vna_gcc.a" ]
290294
defines += [ "SLI_RADIOAES_REQUIRES_MASKING=1" ]
291295
}
296+
297+
defines += [ "MGM24" ]
292298
} else if (silabs_family == "efr32mg26") {
293299
_include_dirs += [
294300
"${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG26/Include",
@@ -300,6 +306,8 @@ template("efr32_sdk") {
300306
"${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg26_gcc_release.a",
301307
"${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg26_gcc_release.a",
302308
]
309+
310+
defines += [ "EFR32MG26" ]
303311
}
304312

305313
if (use_wf200) {
@@ -361,6 +369,29 @@ template("efr32_sdk") {
361369
}
362370
}
363371

372+
if (use_system_view) {
373+
_include_dirs += [
374+
"${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER",
375+
"${efr32_sdk_root}/util/third_party/segger/systemview/init/",
376+
"${efr32_sdk_root}/util/third_party/segger/systemview/profiles/freertos_v10/",
377+
]
378+
379+
defines += [
380+
"SL_CATALOG_SYSTEMVIEW_TRACE_PRESENT",
381+
"SEGGER_SYSVIEW_RTT_BUFFER_SIZE=8192",
382+
]
383+
}
384+
385+
if (use_wstk_leds) {
386+
_include_dirs += [ "${efr32_sdk_root}/platform/driver/leddrv/inc" ]
387+
388+
defines += [ "ENABLE_WSTK_LEDS" ]
389+
}
390+
391+
if (use_wstk_buttons) {
392+
_include_dirs += [ "${efr32_sdk_root}/platform/driver/button/inc" ]
393+
}
394+
364395
if (invoker.enable_dic) {
365396
_include_dirs += [ "${chip_root}/third_party/silabs/mqtt/stack" ]
366397
}
@@ -370,7 +401,7 @@ template("efr32_sdk") {
370401
# the content of these, only when changing the filename itself.
371402
# To fix this, these files are also manually depended upon in the source set
372403
# declared in efr32_mbedtls_config further down this file.
373-
defines = [
404+
defines += [
374405
"MBEDTLS_CONFIG_FILE=\"efr32-chip-mbedtls-config.h\"",
375406
"MBEDTLS_PSA_CRYPTO_CONFIG_FILE=\"efr32-psa-crypto-config.h\"",
376407
"__STARTUP_CLEAR_BSS",
@@ -513,29 +544,6 @@ template("efr32_sdk") {
513544
}
514545
}
515546

516-
if (use_system_view) {
517-
_include_dirs += [
518-
"${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER",
519-
"${efr32_sdk_root}/util/third_party/segger/systemview/init/",
520-
"${efr32_sdk_root}/util/third_party/segger/systemview/profiles/freertos_v10/",
521-
]
522-
523-
defines += [
524-
"SL_CATALOG_SYSTEMVIEW_TRACE_PRESENT",
525-
"SEGGER_SYSVIEW_RTT_BUFFER_SIZE=8192",
526-
]
527-
}
528-
529-
if (use_wstk_leds) {
530-
_include_dirs += [ "${efr32_sdk_root}/platform/driver/leddrv/inc" ]
531-
532-
defines += [ "ENABLE_WSTK_LEDS" ]
533-
}
534-
535-
if (use_wstk_buttons) {
536-
_include_dirs += [ "${efr32_sdk_root}/platform/driver/button/inc" ]
537-
}
538-
539547
if (chip_enable_icd_server) {
540548
defines += [
541549
"SL_ICD_ENABLED=1",

0 commit comments

Comments
 (0)