Skip to content

Commit

Permalink
Merge branch 'master' into darwin_attestation_challenge
Browse files Browse the repository at this point in the history
  • Loading branch information
mburshteyn1 authored Aug 30, 2022
2 parents 36b5c4c + 3be848d commit a61f427
Show file tree
Hide file tree
Showing 30 changed files with 1,021 additions and 493 deletions.
167 changes: 0 additions & 167 deletions config/esp32/components/chip/component.mk

This file was deleted.

1 change: 0 additions & 1 deletion config/esp32/components/esp32_mbedtls/component.mk

This file was deleted.

21 changes: 2 additions & 19 deletions docs/guides/silabs_efr32_software_update.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,69 +14,54 @@ all of the EFR32 example applications.
- On a Linux or Darwin platform build the chip-tool and the ota-provider-app
as follows:

```
scripts/examples/gn_build_example.sh examples/chip-tool out/
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
```

- Build or download the Gecko Bootloader binary. Follow the instructions in
"UG266: Silicon Labs Gecko Bootloader User’s Guide". For the bootloader
using the external flash select the "external SPI" bootloader type
configured with a single slot of at least 1000 KB. For the bootloader using
the internal flash see the Internal Storage Bootloader section below.
Pre-built binaries for some configurations should be available in
Pre-built binaries for some configurations are available at the following
location, see README.md for details

```
third_party/silabs/matter_support/matter/efr32/bootloader_binaries
```

- Using the commander tool upload the bootloader to the device running the
application.

- Create a bootable image file (using the Lighting application image as an
example):

```
commander gbl create chip-efr32-lighting-example.gbl --app chip-efr32-lighting-example.s37
```

- Create the Matter OTA file from the bootable image file:

```
./src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8005 -vn 2 -vs "2.0" -da sha256 chip-efr32-lighting-example.gbl chip-efr32-lighting-example.ota
```

- In a terminal start the Provider app passing to it the path to the Matter
OTA file created in the previous step:

```
rm -r /tmp/chip_*
./out/debug/chip-ota-provider-app -f chip-efr32-lighting-example.ota
```

- In a separate terminal run the chip-tool commands to provision the Provider:

```
./out/chip-tool pairing onnetwork 1 20202021
./out/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
```

- If the application device had been previously commissioned hold Button 0 for
six seconds to factory-reset the device.

- In the chip-tool terminal enter:

```
./out/chip-tool pairing ble-thread 2 hex:<operationalDataset> 20202021 3840
```

where operationalDataset is obtained from the OpenThread Border Router.

- Once the commissioning process completes enter:

```
./out/chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 2 0
```

- The application device will connect to the Provider and start the image
download. Once the image is downloaded the device will reboot into the
Expand All @@ -91,9 +76,7 @@ that both images are built with a reduced feature set such as disabled logging
and Matter shell. The following set of compile flags leaves out all the optional
features and results in the minimal image size:

```
chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false is_debug=false show_qr_code=false chip_build_libshell=false enable_openthread_cli=false chip_openthread_ftd=true
```

Using LZMA compression when building the .gbl file ( passing `--compress lzma`
parameter to the `commander gbl create` command) further reduces the downloaded
Expand Down
7 changes: 7 additions & 0 deletions examples/light-switch-app/efr32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ Silicon Labs platform.
MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
Expand All @@ -78,8 +81,12 @@ Silicon Labs platform.

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
- BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

* Build the example application:

Expand Down
7 changes: 7 additions & 0 deletions examples/lighting-app/efr32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ Silicon Labs platform.
MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
Expand All @@ -75,8 +78,12 @@ Silicon Labs platform.

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
- BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

* Build the example application:

Expand Down
8 changes: 8 additions & 0 deletions examples/lock-app/efr32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ Silicon Labs platform.
MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
Expand All @@ -73,8 +76,13 @@ Silicon Labs platform.

MG24 boards :

- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
- BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

* Build the example application:

Expand Down
16 changes: 15 additions & 1 deletion examples/persistent-storage/efr32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,29 @@ The EFR32 platform KVS is fully implemented
MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
915MHz@19dBm
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm

MG21 boards:
MG21 boards: Currently not supported due to RAM limitation.

- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

MG24 boards :

- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
- BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

* Build the example application:

cd ~/connectedhomeip
Expand Down
12 changes: 11 additions & 1 deletion examples/pigweed-app/efr32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ following features are available:
MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Dual band Wireless Starter Kit / 2.4GHz@19dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Dual band Wireless Starter Kit / 2.4GHz@19dBm,
Expand All @@ -75,10 +76,19 @@ following features are available:
915MHz@19dBm
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm

MG21 boards:
MG21 boards: Currently not supported due to RAM limitation.

- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
- BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

* Build the example application:

cd ~/connectedhomeip/examples/pigweed-app/efr32
Expand Down
Loading

0 comments on commit a61f427

Please sign in to comment.