diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn index 3437758d955625..e938574e195aa6 100644 --- 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 index a505b7c8a23408..b3fb8fdd5b86c8 100644 --- 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 index 7d5087b638f95d..9a9e4c15b8f33c 100644 --- 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 index 2fc93ff6608479..a739b266110543 100644 --- 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 index 4683fbba0842bc..90f61b99ca1ad6 100644 --- 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 index a9c365df7332e3..fad09d7f4d3ce7 100644 --- 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 index ba3e8ffb4500b8..b697d2bb3afbc8 100644 --- 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 index 1e95a9091f0489..e4af7e65333a28 100644 --- 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 index 054e5c798dced6..a7801b3fa49327 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 054e5c798dced6ac372eddd64b183ee9b5588c26 +Subproject commit a7801b3fa493270b6832061ec9997eca3767ba67