Updated gni with board specific path

project-chip · Sep 14, 2023 · f0ecd61 · f0ecd61
1 parent de969b7
commit f0ecd61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -67,8 +67,7 @@ template("siwx917_sdk") {
       "${wifi_sdk_root}/components/si91x/sl_net/inc",
 
       # siwx917_soc component
-      "${wifi_sdk_root}/components/siwx917_soc/inc",
-      "${wifi_sdk_root}/components/siwx917_soc/boards/config/brd4325b",
+      "${wifi_sdk_root}/components/siwx917_soc/boards/config/${silabs_board_lower}",
       "${wifi_sdk_root}/components/siwx917_soc/boards/inc",
       "${wifi_sdk_root}/components/siwx917_soc/core/chip/inc",
       "${wifi_sdk_root}/components/siwx917_soc/core/config",
@@ -90,8 +89,6 @@ template("siwx917_sdk") {
 
       # si91x_support component
       "${wifi_sdk_root}/components/si91x_support/inc",
-      "${wifi_sdk_root}/components/si91x_support/brd4325b",
-      "${wifi_sdk_root}/components/si91x_support/siwx917_soc",
 
       # wifi_resources component
       "${wifi_sdk_root}/resources/certificates",

diff --git a/third_party/silabs/silabs_board.gni b/third_party/silabs/silabs_board.gni
@@ -15,6 +15,7 @@
 declare_args() {
   # EFR32 board used
   silabs_board = ""
+  silabs_board_lower = ""
 
   # LCD is enabled by default
   # Boards BRD4166A, BRD2601B, BRD2703A and BRD4319A do not have a LCD so they disable it explicitly
@@ -106,27 +107,31 @@ if (silabs_board == "BRD4304A") {
   disable_lcd = true
   show_qr_code = false
   wifi_soc = true
+  silabs_board_lower = "brd4325b"
 } 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
+  silabs_board_lower = "brd4325c"
 } 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
+  silabs_board_lower = "brd4325g"
 } 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
+  silabs_board_lower = "brd4338a"
 } else if (silabs_board == "BRD4180A") {
   assert(
       false,