Skip to content

Commit 5c4749d

Browse files
jmartinez-silabsjmartinez-silabs
committed
Try to regroup all _include_dir together. List MCU include before ncp's for wifi ncp combos
1 parent eb4c125 commit 5c4749d

File tree

1 file changed

+88
-88
lines changed

1 file changed

+88
-88
lines changed

‎third_party/silabs/efr32_sdk.gni

+88-88
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,90 @@ template("efr32_sdk") {
228228
"${sl_ot_libs_path}/config",
229229
]
230230

231+
if (is_series_2) {
232+
_include_dirs += [
233+
"${efr32_sdk_root}/platform/emdrv/dmadrv/inc/s2_signals",
234+
"${efr32_sdk_root}/platform/driver/debug/inc/",
235+
"${efr32_sdk_root}/platform/radio/rail_lib/chip/efr32/efr32xg2x",
236+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/",
237+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/",
238+
"${efr32_sdk_root}/platform/service/device_init/config/s2/",
239+
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure",
240+
]
241+
242+
libs += [
243+
"${sdk_support_root}/platform/emdrv/nvm3/lib/libnvm3_CM33_gcc.a",
244+
"${sdk_support_root}/protocol/openthread/libs/libsl_openthread_efr32mg2x_gcc.a",
245+
]
246+
247+
if (!chip_enable_ble_rs911x) {
248+
libs += [
249+
"${sdk_support_root}/protocol/bluetooth/bgcommon/lib/build/gcc/cortex-m33/bgcommon/release/libbgcommon.a",
250+
"${sdk_support_root}/protocol/bluetooth/build/gcc/cortex-m33/bt_host/release/libbt_host.a",
251+
"${sdk_support_root}/protocol/bluetooth/build/gcc/cortex-m33/bt_host/hal/release/libbt_hal_series2.a",
252+
]
253+
}
254+
}
255+
256+
if (silabs_family == "efr32mg24") {
257+
_include_dirs += [
258+
"${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Include",
259+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24",
260+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24/config",
261+
"${efr32_sdk_root}/platform/emdrv/spidrv/inc",
262+
"${efr32_sdk_root}/platform/emdrv/spidrv/config",
263+
]
264+
265+
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg24_gcc_release.a" ]
266+
267+
if (!chip_enable_ble_rs911x) {
268+
libs += [ "${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg24_gcc_release.a" ]
269+
}
270+
} else if (silabs_family == "mgm24") {
271+
_include_dirs += [
272+
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Include",
273+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24",
274+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24/config",
275+
]
276+
277+
libs += [
278+
"${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg24_gcc_release.a",
279+
"${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_module_efr32xg24_gcc_release.a",
280+
]
281+
282+
if (silabs_mcu == "MGM240PB32VNA") {
283+
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240pb32vna_gcc.a" ]
284+
} else if (silabs_mcu == "MGM240PB22VNA") {
285+
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240pb22vna_gcc.a" ]
286+
} else if (silabs_mcu == "MGM240L022RNF") {
287+
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240l022rnf_gcc.a" ]
288+
} else if (silabs_mcu == "MGM240SD22VNA") {
289+
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240sd22vna_gcc.a" ]
290+
defines += [ "SLI_RADIOAES_REQUIRES_MASKING=1" ]
291+
}
292+
} else if (silabs_family == "efr32mg26") {
293+
_include_dirs += [
294+
"${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG26/Include",
295+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg26",
296+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg26/config",
297+
]
298+
299+
libs += [
300+
"${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg26_gcc_release.a",
301+
"${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg26_gcc_release.a",
302+
]
303+
}
304+
305+
if (use_wf200) {
306+
_include_dirs += [
307+
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver",
308+
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/bus",
309+
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/firmware",
310+
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/pds/brd8022a",
311+
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/secure_link",
312+
]
313+
}
314+
231315
if (use_SiWx917) {
232316
_include_dirs += [
233317
# si91x component
@@ -277,6 +361,10 @@ template("efr32_sdk") {
277361
}
278362
}
279363

364+
if (invoker.enable_dic) {
365+
_include_dirs += [ "${chip_root}/third_party/silabs/mqtt/stack" ]
366+
}
367+
280368
# Note that we're setting the mbedTLS and PSA configuration files through a
281369
# define. This means the build system by default does not pick up changes in
282370
# the content of these, only when changing the filename itself.
@@ -517,98 +605,10 @@ template("efr32_sdk") {
517605
]
518606
}
519607

520-
if (invoker.enable_dic) {
521-
_include_dirs += [ "${chip_root}/third_party/silabs/mqtt/stack" ]
522-
}
523-
524608
if (sl_use_subscription_synching) {
525609
defines += [ "CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED=1" ]
526610
}
527611

528-
if (is_series_2) {
529-
_include_dirs += [
530-
"${efr32_sdk_root}/platform/emdrv/dmadrv/inc/s2_signals",
531-
"${efr32_sdk_root}/platform/driver/debug/inc/",
532-
"${efr32_sdk_root}/platform/radio/rail_lib/chip/efr32/efr32xg2x",
533-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/",
534-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/",
535-
"${efr32_sdk_root}/platform/service/device_init/config/s2/",
536-
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure",
537-
]
538-
539-
libs += [
540-
"${sdk_support_root}/platform/emdrv/nvm3/lib/libnvm3_CM33_gcc.a",
541-
"${sdk_support_root}/protocol/openthread/libs/libsl_openthread_efr32mg2x_gcc.a",
542-
]
543-
544-
if (!chip_enable_ble_rs911x) {
545-
libs += [
546-
"${sdk_support_root}/protocol/bluetooth/bgcommon/lib/build/gcc/cortex-m33/bgcommon/release/libbgcommon.a",
547-
"${sdk_support_root}/protocol/bluetooth/build/gcc/cortex-m33/bt_host/release/libbt_host.a",
548-
"${sdk_support_root}/protocol/bluetooth/build/gcc/cortex-m33/bt_host/hal/release/libbt_hal_series2.a",
549-
]
550-
}
551-
}
552-
553-
if (silabs_family == "efr32mg24") {
554-
_include_dirs += [
555-
"${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Include",
556-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24",
557-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24/config",
558-
"${efr32_sdk_root}/platform/emdrv/spidrv/inc",
559-
"${efr32_sdk_root}/platform/emdrv/spidrv/config",
560-
]
561-
562-
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg24_gcc_release.a" ]
563-
564-
if (!chip_enable_ble_rs911x) {
565-
libs += [ "${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg24_gcc_release.a" ]
566-
}
567-
} else if (silabs_family == "mgm24") {
568-
_include_dirs += [
569-
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Include",
570-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24",
571-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24/config",
572-
]
573-
574-
libs += [
575-
"${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg24_gcc_release.a",
576-
"${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_module_efr32xg24_gcc_release.a",
577-
]
578-
579-
if (silabs_mcu == "MGM240PB32VNA") {
580-
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240pb32vna_gcc.a" ]
581-
} else if (silabs_mcu == "MGM240PB22VNA") {
582-
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240pb22vna_gcc.a" ]
583-
} else if (silabs_mcu == "MGM240L022RNF") {
584-
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240l022rnf_gcc.a" ]
585-
} else if (silabs_mcu == "MGM240SD22VNA") {
586-
libs += [ "${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_config_mgm240sd22vna_gcc.a" ]
587-
defines += [ "SLI_RADIOAES_REQUIRES_MASKING=1" ]
588-
}
589-
} else if (silabs_family == "efr32mg26") {
590-
_include_dirs += [
591-
"${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG26/Include",
592-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg26",
593-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg26/config",
594-
]
595-
596-
libs += [
597-
"${sdk_support_root}/protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg26_gcc_release.a",
598-
"${sdk_support_root}/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg26_gcc_release.a",
599-
]
600-
}
601-
602-
if (use_wf200) {
603-
_include_dirs += [
604-
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver",
605-
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/bus",
606-
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/firmware",
607-
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/pds/brd8022a",
608-
"${efr32_sdk_root}/platform/radio/wifi/wfx_fmac_driver/secure_link",
609-
]
610-
}
611-
612612
cflags = []
613613
foreach(include_dir, _include_dirs) {
614614
cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]

0 commit comments

Comments
 (0)