Skip to content

Commit

Permalink
Updated gni for B0 2.0 common flash
Browse files Browse the repository at this point in the history
  • Loading branch information
silabs-srishylam committed Sep 4, 2023
1 parent 54038c0 commit 1c7e485
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
20 changes: 11 additions & 9 deletions third_party/silabs/SiWx917_sdk.gni
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",
"${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
5 changes: 5 additions & 0 deletions third_party/silabs/silabs_board.gni
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

0 comments on commit 1c7e485

Please sign in to comment.