updated gni

project-chip · Aug 29, 2023 · 7e0d3ae · 7e0d3ae
1 parent 88cfd37
commit 7e0d3ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -133,6 +133,7 @@ template("siwx917_sdk") {
  "KVS_MAX_ENTRIES=${kvs_max_entries}",
  "${silabs_mcu}=1",
  "${silabs_board}=1",
+ "SL_BOARD_NAME=${silabs_board}",
  "__HEAP_SIZE=0",
  "PLATFORM_HEADER=\"platform-header.h\"",
  "USE_NVM3=1",
@@ -164,31 +165,18 @@ template("siwx917_sdk") {
 
  if (silabs_board == "BRD4325B") {
  defines += [
- "BRD4325A",
- "BRD4325B",
  "DUAL_FLASH_EN",
  ]
  }
- if (silabs_board == "BRD4325C") {
+ if (wifi_soc_common_flash) {
  defines += [
- "BRD4325C",
  "CHIP_917B0 = 1",
- "SL_BOARD_NAME=\"BRD4325C\"",
  "COMMON_FLASH_EN=1",
  "EXECUTION_FROM_RAM",
- "SL_BOARD_REV=\"A01\"",
- ]
- }
- if (silabs_board == "BRD4338A") {
- defines += [
- "BRD4338A",
- "CHIP_917B0 = 1",
- "SL_BOARD_NAME=\"BRD4338A\"",
- "COMMON_FLASH_EN=1",
- "EXECUTION_FROM_RAM",
- "SL_BOARD_REV=\"A01\"",
- "SI917_RADIO_BOARD_V2=1",
  ]
+ if(silabs_board == "BRD4338A") {
+ defines += [ "SI917_RADIO_BOARD_V2=1" ]
+ }
  }
 
  if (chip_build_libshell) {
@@ -418,7 +406,7 @@ template("siwx917_sdk") {
  ]
  }
 
- if (silabs_board == "BRD4325C" || silabs_board == "BRD4338A") {
+ if (wifi_soc_common_flash) {
  sources += [
  "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/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/silabs_board.gni b/third_party/silabs/silabs_board.gni
@@ -37,6 +37,7 @@ declare_args() {
  chip_enable_ble_rs911x = false
 
  wifi_soc = false
+ wifi_soc_common_flash = false
 
  #Disable MQTT by default
  enable_dic = false
@@ -111,18 +112,21 @@ if (silabs_board == "BRD4304A") {
  disable_lcd = true
  show_qr_code = false
  wifi_soc = true
+ wifi_soc_common_flash = true
 } 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
 } 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
 } else if (silabs_board == "BRD4180A") {
  assert(
  false,