Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Silabs] updated GNI for B0 2.0 board #29055

Merged
merged 3 commits into from
Sep 14, 2023
Merged

[Silabs] updated GNI for B0 2.0 board #29055

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
074c267
Updated gni for B0 2.0 common flash
silabs-srishylam Sep 4, 2023
3765d96
updated matter_support
silabs-srishylam Sep 8, 2023
fd85d28
moved board defines to SiWx917_sdk.gni
silabs-srishylam Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions third_party/silabs/SiWx917_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,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",
jmartinez-silabs marked this conversation as resolved.
Show resolved Hide resolved
"${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",

Expand All @@ -67,6 +67,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",
Expand Down Expand Up @@ -106,7 +107,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
Expand Down Expand Up @@ -322,6 +323,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",
Expand Down Expand Up @@ -361,9 +363,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
Expand Down Expand Up @@ -406,14 +408,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",
]
}
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/matter_support
Open in desktop
Submodule matter_support updated 10 files
+31 −0 matter/si91x/siwx917/BRD4338A/autogen/RTE_Components.h
+39 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_component_catalog.h
+29 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.c
+11 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.h
+49 −0 matter/si91x/siwx917/BRD4338A/config/emlib_core_debug_config.h
+101 −0 matter/si91x/siwx917/BRD4338A/support/hal/rsi_hal_mcu_m4.c
+206 −0 matter/si91x/siwx917/BRD4338A/support/hal/rsi_hal_mcu_platform_init.c
+216 −0 matter/si91x/siwx917/BRD4338A/support/hal/rsi_hal_mcu_timer.c
+168 −0 matter/si91x/siwx917/BRD4338A/support/inc/system_si917.h
+514 −0 matter/si91x/siwx917/BRD4338A/support/src/startup_common_RS1xxxx.c
5 changes: 5 additions & 0 deletions third_party/silabs/silabs_board.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ declare_args() {

wifi_soc = false
wifi_soc_common_flash = false
sdk_support_board = ""

#Disable MQTT by default
enable_dic = false
Expand Down Expand Up @@ -106,27 +107,31 @@ if (silabs_board == "BRD4304A") {
disable_lcd = true
show_qr_code = false
wifi_soc = true
sdk_support_board = "BRD4325x"
} else if (silabs_board == "BRD4325C") {
silabs_family = "SiWx917-common"
silabs_mcu = "SiWG917M111MGTBA"
disable_lcd = true
show_qr_code = false
wifi_soc = true
wifi_soc_common_flash = true
sdk_support_board = "BRD4325x"
} else if (silabs_board == "BRD4325G") {
silabs_family = "SiWx917-common"
silabs_mcu = "SiWG917M111MGTBA"
disable_lcd = true
show_qr_code = false
wifi_soc = true
wifi_soc_common_flash = true
sdk_support_board = "BRD4325x"
} else if (silabs_board == "BRD4338A") {
silabs_family = "SiWx917-common"
silabs_mcu = "SiWG917M111MGTBA"
disable_lcd = true
show_qr_code = false
wifi_soc = true
wifi_soc_common_flash = true
sdk_support_board = "BRD4338A"
} else if (silabs_board == "BRD4180A") {
assert(
false,
Expand Down
Loading