[EFR32]Add new boards support (#21762)

jmartinez-silabs · pull[bot] · commit 568777772926 · 2023-10-05T03:08:10.000Z
* WIP support for brd2601B

* Disable LCD/QRcode as brd2601 doesn't have a lcd

* Fix led polarity. Remove LCD code for BRD2601B

* update matter support submodule for new board files
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn
@@ -91,8 +91,8 @@ chip_data_model("chef-common") {
   is_server = true
 }
 
-# BRD4166A --> ThunderBoard Sense 2 (No LCD)
-if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
+# ThunderBoards  (No LCD)
+if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") {
   show_qr_code = false
   disable_lcd = true
 }
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -84,8 +84,8 @@ if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
 }
 
-# BRD4166A --> ThunderBoard Sense 2 (No LCD)
-if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
+# ThunderBoards  (No LCD)
+if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") {
   show_qr_code = false
   disable_lcd = true
 }
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -84,8 +84,8 @@ if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
 }
 
-# BRD4166A --> ThunderBoard Sense 2 (No LCD)
-if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
+# ThunderBoards  (No LCD)
+if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") {
   show_qr_code = false
   disable_lcd = true
 }
diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -84,8 +84,8 @@ if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
 }
 
-# BRD4166A --> ThunderBoard Sense 2 (No LCD)
-if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
+# ThunderBoards  (No LCD)
+if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") {
   show_qr_code = false
   disable_lcd = true
 }
diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn
@@ -81,8 +81,8 @@ if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
 }
 
-# BRD4166A --> ThunderBoard Sense 2 (No LCD)
-if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
+# ThunderBoards  (No LCD)
+if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") {
   show_qr_code = false
   disable_lcd = true
 }
diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -77,8 +77,8 @@ if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
 }
 
-# BRD4166A --> ThunderBoard Sense 2 (No LCD)
-if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
+# ThunderBoards  (No LCD)
+if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") {
   show_qr_code = false
   disable_lcd = true
 }
diff --git a/third_party/silabs/efr32_board.gni b/third_party/silabs/efr32_board.gni
@@ -59,14 +59,24 @@ if (efr32_board == "BRD4304A") {
 } else if (efr32_board == "BRD4180A") {
   assert(
       false,
-      "The board ${efr32_board} not currentlt supported due to RAM limitation")
+      "The board ${efr32_board} not currently supported due to RAM limitation")
   efr32_family = "efr32mg21"
   efr32_mcu = "EFR32MG21A020F1024IM32"
 } else if (efr32_board == "BRD4186A" || efr32_board == "BRD4187A") {
+  print("RevA is deprecated, We suggest using BRD4186C (rev C)")
   efr32_family = "efr32mg24"
   efr32_mcu = "EFR32MG24A010F1536GM48"
+} else if (efr32_board == "BRD4186C") {
+  efr32_family = "efr32mg24"
+  efr32_mcu = "EFR32MG24B210F1536IM48"
+} else if (efr32_board == "BRD4187C") {
+  efr32_family = "efr32mg24"
+  efr32_mcu = "EFR32MG24B220F1536IM48"
+} else if (efr32_board == "BRD2601B") {
+  efr32_family = "efr32mg24"
+  efr32_mcu = "EFR32MG24B310F1536IM48"
 } else {
   print(
-      "Please provide a valid value for EFR32_BOARD env variable (currently supported BRD4304A, BRD4161A, BRD4163A, BRD4164A BRD4166A, BRD4170A, BRD4186A, BRD4187A)")
-  assert(false, "The board ${efr32_board} is unsupported as for now.")
+      "Please provide a valid value for EFR32_BOARD env variable (currently supported BRD4304A, BRD4161A, BRD4163A, BRD4164A BRD4166A, BRD4170A, BRD4186C, BRD4187C, BRD2601B)")
+  assert(false, "The board ${efr32_board} is unsupported")
 }
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -219,7 +219,6 @@ template("efr32_sdk") {
 
     if (efr32_family == "efr32mg12") {
       _include_dirs += [
-        "${efr32_sdk_root}/hardware/kit/EFR32MG12_${efr32_board}/config",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG12P/Include",
         "${efr32_sdk_root}/platform/radio/rail_lib/chip/efr32/efr32xg1x",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM4F",
@@ -236,7 +235,6 @@ template("efr32_sdk") {
       defines += [ "EFR32MG12" ]
     } else if (efr32_family == "efr32mg21") {
       _include_dirs += [
-        "${efr32_sdk_root}/hardware/kit/EFR32MG21_${efr32_board}/config",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG21/Include",
         "${efr32_sdk_root}/platform/radio/rail_lib/chip/efr32/efr32xg2x",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure",
@@ -257,7 +255,6 @@ template("efr32_sdk") {
       ]
     } else if (efr32_family == "efr32mg24") {
       _include_dirs += [
-        "${efr32_sdk_root}/hardware/kit/EFR32MG24_${efr32_board}/config",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Include",
         "${efr32_sdk_root}/platform/radio/rail_lib/chip/efr32/efr32xg2x",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure",
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit 054e5c798dced6ac372eddd64b183ee9b5588c26
+Subproject commit a7801b3fa493270b6832061ec9997eca3767ba67

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ chip_data_model("chef-common") {`
`91`	`91`	`is_server = true`
`92`	`92`	`}`
`93`	`93`
`94`		`-# BRD4166A --> ThunderBoard Sense 2 (No LCD)`
`95`		`-if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD4180A") {`
	`94`	`+# ThunderBoards (No LCD)`
	`95`	`+if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD2601B") {`
`96`	`96`	`show_qr_code = false`
`97`	`97`	`disable_lcd = true`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ if (chip_enable_wifi) {`
`84`	`84`	`assert(use_rs911x \|\| use_wf200)`
`85`	`85`	`}`
`86`	`86`
`87`		`-# BRD4166A --> ThunderBoard Sense 2 (No LCD)`
`88`		`-if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD4180A") {`
	`87`	`+# ThunderBoards (No LCD)`
	`88`	`+if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD2601B") {`
`89`	`89`	`show_qr_code = false`
`90`	`90`	`disable_lcd = true`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ if (chip_enable_wifi) {`
`81`	`81`	`assert(use_rs911x \|\| use_wf200)`
`82`	`82`	`}`
`83`	`83`
`84`		`-# BRD4166A --> ThunderBoard Sense 2 (No LCD)`
`85`		`-if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD4180A") {`
	`84`	`+# ThunderBoards (No LCD)`
	`85`	`+if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD2601B") {`
`86`	`86`	`show_qr_code = false`
`87`	`87`	`disable_lcd = true`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ if (chip_enable_wifi) {`
`77`	`77`	`assert(use_rs911x \|\| use_wf200)`
`78`	`78`	`}`
`79`	`79`
`80`		`-# BRD4166A --> ThunderBoard Sense 2 (No LCD)`
`81`		`-if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD4180A") {`
	`80`	`+# ThunderBoards (No LCD)`
	`81`	`+if (efr32_board == "BRD4166A" \|\| efr32_board == "BRD2601B") {`
`82`	`82`	`show_qr_code = false`
`83`	`83`	`disable_lcd = true`
`84`	`84`	`}`