From 78451682f1257efc7214c604363f59731e590378 Mon Sep 17 00:00:00 2001 From: srningap <107042150+srningap@users.noreply.github.com> Date: Thu, 14 Sep 2023 19:10:47 +0530 Subject: [PATCH] [Silabs] updated GNI for B0 2.0 board (#29055) * Updated gni for B0 2.0 common flash * updated matter_support * moved board defines to SiWx917_sdk.gni --- third_party/silabs/SiWx917_sdk.gni | 26 +++++++++++++++++--------- third_party/silabs/matter_support | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni index a3164a636bef0d..79fbf8516347c6 100644 --- a/third_party/silabs/SiWx917_sdk.gni +++ b/third_party/silabs/SiWx917_sdk.gni @@ -25,6 +25,12 @@ import("silabs_board.gni") declare_args() { wifi_sdk_root = "${chip_root}/third_party/silabs/wifi_sdk" examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917" + + if (silabs_board == "BRD4338A") { + sdk_support_board = "BRD4338A" + } else { + sdk_support_board = "BRD4325x" + } } # Defines an siwx917 SDK build target. @@ -46,13 +52,13 @@ template("siwx917_sdk") { _include_dirs = [ "${chip_root}", "${chip_root}/examples/platform/silabs/SiWx917/SiWx917", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/hal", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/hal", "${efr32_sdk_root}/platform/emdrv/nvm3/inc", "${efr32_sdk_root}/platform/emdrv/common/inc", "${efr32_sdk_root}/platform/service/device_init/inc", "${sdk_support_root}/matter/mbedtls/tinycrypt/inc", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/autogen", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/config", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/autogen", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/config", "${chip_root}/third_party/mbedtls/repo/include", "${chip_root}/third_party/mbedtls/repo/library", @@ -67,6 +73,7 @@ template("siwx917_sdk") { "${wifi_sdk_root}/components/si91x/sl_net/inc", # siwx917_soc component + "${wifi_sdk_root}/components/siwx917_soc/core/config", "${wifi_sdk_root}/components/siwx917_soc/inc", "${wifi_sdk_root}/components/siwx917_soc/drivers/cmsis_driver", "${wifi_sdk_root}/components/siwx917_soc/drivers/cmsis_driver/config", @@ -106,7 +113,7 @@ template("siwx917_sdk") { "${efr32_sdk_root}/util/third_party/freertos/kernel/include", "${wifi_sdk_root}/components/protocol/wifi/si91x", "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM4F", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/inc", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/inc", ] # Note that we're setting the mbedTLS and PSA configuration files through a @@ -322,6 +329,7 @@ template("siwx917_sdk") { "${wifi_sdk_root}/components/siwx917_soc/boards/brd4325x/src/rsi_board.c", "${wifi_sdk_root}/components/siwx917_soc/core/chip/src/rsi_deepsleep_soc.c", "${wifi_sdk_root}/components/siwx917_soc/core/chip/src/system_si91x.c", + "${wifi_sdk_root}/components/siwx917_soc/core/config/src/rsi_nvic_priorities_config.c", "${wifi_sdk_root}/components/siwx917_soc/drivers/cmsis_driver/UDMA.c", "${wifi_sdk_root}/components/siwx917_soc/drivers/cmsis_driver/USART.c", "${wifi_sdk_root}/components/siwx917_soc/drivers/ipmu/ipmu_apis.c", @@ -361,9 +369,9 @@ template("siwx917_sdk") { "${efr32_sdk_root}/util/third_party/freertos/kernel/stream_buffer.c", "${efr32_sdk_root}/util/third_party/freertos/kernel/tasks.c", "${efr32_sdk_root}/util/third_party/freertos/kernel/timers.c", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/autogen/sl_event_handler.c", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/hal/rsi_hal_mcu_m4.c", - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/hal/rsi_hal_mcu_platform_init.c", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/autogen/sl_event_handler.c", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/hal/rsi_hal_mcu_m4.c", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/hal/rsi_hal_mcu_platform_init.c", "${wifi_sdk_root}/components/siwx917_soc/drivers/middleware/nvm3/src/sl_si91x_nvm3_hal_flash.c", # mbedtls @@ -406,14 +414,14 @@ template("siwx917_sdk") { # nvm3 ans startup if (silabs_board == "BRD4325B") { sources += [ - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/src/startup_RS1xxxx.c", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/src/startup_RS1xxxx.c", "${wifi_sdk_root}/components/siwx917_soc/drivers/middleware/nvm3/src/sl_si91x_dual_flash_intf.c", ] } if (wifi_soc_common_flash) { sources += [ - "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/src/startup_common_RS1xxxx.c", + "${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/src/startup_common_RS1xxxx.c", "${wifi_sdk_root}/components/siwx917_soc/drivers/middleware/nvm3/src/sl_si91x_common_flash_intf.c", ] } diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index 130270901b4d37..32535c94e815b6 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 130270901b4d377950a47b1ceddde300d9eea981 +Subproject commit 32535c94e815b60b9efd594abc20372850526c0b