Skip to content

Commit 74f076d

Browse files
abiradartiabiradarti
authored
Merge branch 'master' into icd_support_for_cc13x4
2 parents 79a4a7c + c172e30 commit 74f076d

File tree

39 files changed

+206
-166
lines changed

39 files changed

+206
-166
lines changed

‎.github/workflows/examples-ameba.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-ameba:41
39+
image: ghcr.io/project-chip/chip-build-ameba:42
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-cc13x2x7_26x2x7.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-ti:41
39+
image: ghcr.io/project-chip/chip-build-ti:46
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242
steps:

‎.github/workflows/examples-cc32xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-ti:41
40+
image: ghcr.io/project-chip/chip-build-ti:46
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-esp32.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ jobs:
9090
rm -rf ./zzz_pregenerated
9191
mv scripts/codegen.py.renamed scripts/codegen.py
9292
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
93-
- name: Build example All Clusters App C3
94-
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_c3devkit.defaults
93+
- name: Build example All Clusters App(Target:ESP32C3)
94+
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
9595
- name: Copy aside build products
9696
run: |
9797
mkdir -p example_binaries/esp32-build
@@ -106,10 +106,10 @@ jobs:
106106
run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
107107

108108
- name: Build example Lighting App (Target:ESP32H2)
109-
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2
109+
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
110110

111111
- name: Build example Lock App (Target:ESP32C6)
112-
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6
112+
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
113113

114114
- name: Uploading Size Reports
115115
uses: ./.github/actions/upload-size-reports
@@ -155,10 +155,13 @@ jobs:
155155
run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
156156

157157
- name: Build example Light Switch App (Target:ESP32C3)
158-
run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3
158+
run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3 esp32c3
159159

160160
- name: Build example Lighting App (external platform)
161161
run: scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
162162

163163
- name: Build example Energy Management App
164164
run: scripts/examples/esp_example.sh energy-management-app sdkconfig.defaults
165+
166+
- name: Build example LIT ICD App (Target:ESP32H2)
167+
run: scripts/examples/esp_example.sh lit-icd-app sdkconfig.defaults esp32h2

‎config/nrfconnect/chip-module/Kconfig.defaults

+3-3
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,10 @@ config SHELL_STACK_SIZE
452452
default 2616 if CHIP_WIFI
453453

454454
config SHELL_MINIMAL
455-
default y
455+
default y if !CHIP_MEMORY_PROFILING
456456

457457
config KERNEL_SHELL
458-
default n
458+
default n if !CHIP_MEMORY_PROFILING
459459

460460
config SENSOR_SHELL
461461
default n
@@ -482,7 +482,7 @@ config HWINFO_SHELL
482482
default n
483483

484484
config OPENTHREAD_SHELL
485-
default n
485+
default n if !CHIP_MEMORY_PROFILING
486486

487487
endif # SHELL
488488

‎config/nrfconnect/chip-module/Kconfig.features

+7-2
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,20 @@ endif # CHIP_SPI_NOR
7575

7676
config CHIP_MEMORY_PROFILING
7777
bool "Enable features for tracking memory usage"
78+
# Matter stack
7879
select CHIP_STATISTICS
80+
# Heap
7981
select CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT if CHIP_MALLOC_SYS_HEAP
82+
select SYS_HEAP_RUNTIME_STATS if CHIP_MALLOC_SYS_HEAP
83+
# Crypto
8084
select MBEDTLS_MEMORY_DEBUG if !CHIP_CRYPTO_PSA
81-
select SYS_HEAP_RUNTIME_STATS if CHIP_MALLOC_SYS_HEAP
82-
select KERNEL_SHELL
85+
# Network
8386
select NET_STATISTICS
8487
select NET_SHELL
8588
select NET_BUF_POOL_USAGE
8689
select OPENTHREAD_SHELL if !CHIP_WIFI
90+
# Zephyr
91+
select KERNEL_SHELL
8792
help
8893
Enables features for tracking memory usage in Matter.
8994

‎docs/guides/nxp_manufacturing_flow.md

+10-18
Original file line numberDiff line numberDiff line change
@@ -215,26 +215,15 @@ converted to an encrypted blob. This blob will overwrite the DAC private key in
215215
factory data and will be imported in the `SSS` at initialization, by the factory
216216
data provider instance.
217217

218-
The conversion process shall happen at manufacturing time and should be run one
219-
time only:
220-
221-
- Write factory data binary.
222-
- Build the application with
223-
`chip_with_factory_data=1 chip_convert_dac_private_key=1` set.
224-
- Write the application to the board and let it run.
225-
226-
After the conversion process:
218+
The application will check at initialization whether the DAC private key has
219+
been converted or not and convert it if needed. However, the conversion process
220+
should be done at manufacturing time for security reasons.
227221

228-
- Make sure the application is built with `chip_with_factory_data=1`, but
229-
without `chip_convert_dac_private_key` arg, since conversion already
230-
happened.
231-
- Write the application to the board.
232-
233-
If you are using Jlink, you can see a conversion script example in:
222+
There is no need for an extra binary.
234223

235-
```shell
236-
./scripts/tools/nxp/factory_data_generator/k32w1/example_convert_dac_private_key.jlink
237-
```
224+
- Write factory data binary.
225+
- Build the application with `chip_with_factory_data=1` set.
226+
- Write the application to the board and use it as usual.
238227

239228
Factory data should now contain a corresponding encrypted blob instead of the
240229
DAC private key.
@@ -251,6 +240,9 @@ python3 ./scripts/tools/nxp/factory_data_generator/generate.py -i 10000 -s UXKLz
251240
Please note that `--dac_key` now points to a binary file that contains the
252241
encrypted blob.
253242

243+
The user can use the DAC private in plain text instead of using the `SSS` by
244+
adding the following gn argument `chip_use_plain_dac_key=true`.
245+
254246
### 6.2 RW61X
255247

256248
Supported platforms:

‎docs/guides/nxp_rw61x_ota_software_update.md

+4
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ To generate the OTA update image the same procedure can be followed from the
223223
sub-section, replacing the "--version "1.0"" argument with "--version "2.0""
224224
(recent version of the update).
225225

226+
Note : When building the update image, the build arguments
227+
`nxp_software_version=2 nxp_sofware_version_string=\"2.0\"` can be added to the
228+
`gn gen` command in order to specify the upgraded version.
229+
226230
When the signed binary of the update is generated, the file should be converted
227231
into OTA format. To do so, the ota_image_tool is provided in the repo and can be
228232
used to convert a binary file into an .ota file.

‎examples/all-clusters-app/ameba/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ The CHIP demo application is supported on
2727

2828
- Pull docker image:
2929

30-
$ docker pull ghcr.io/project-chip/chip-build-ameba:35
30+
$ docker pull ghcr.io/project-chip/chip-build-ameba:42
3131

3232
- Run docker container:
3333

34-
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
34+
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
3535

3636
- Setup build environment:
3737

‎examples/all-clusters-app/cc13x4_26x4/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
5959

6060
```
6161
$ cd ~
62-
$ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
63-
$ chmod +x sysconfig-1.16.2_3028-setup.run
64-
$ ./sysconfig-1.16.2_3028-setup.run
62+
$ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.18.1.3343/sysconfig-1.18.1_3343-setup.run
63+
$ chmod +x sysconfig-1.18.1_3343-setup.run
64+
$ ./sysconfig-1.18.1_3343-setup.run
6565
```
6666
6767
- Run the bootstrap script to setup the build environment.
@@ -88,15 +88,15 @@ Ninja to build the executable.
8888
- Run the build to produce a default executable. By default on Linux both the
8989
TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
9090
home directory, and you must provide the absolute path to them. For example
91-
`/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
91+
`/home/username/ti/sysconfig_1.18.1`. On Windows the default directory is
9292
`C:\ti`. Take note of this install path, as it will be used in the next
9393
step.
9494
9595
```
9696
$ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
9797
OR
9898
$ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4
99-
$ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
99+
$ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
100100
$ ninja -C out/debug
101101
102102
```
@@ -105,7 +105,7 @@ Ninja to build the executable.
105105
to the GN call.
106106
107107
```
108-
gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
108+
gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
109109
```
110110
111111
## Programming

‎examples/all-clusters-app/esp32/sdkconfig_c3devkit.defaults ‎examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c3

File renamed without changes.

‎examples/light-switch-app/ameba/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ The CHIP demo application is supported on
2626

2727
- Pull docker image:
2828

29-
$ docker pull ghcr.io/project-chip/chip-build-ameba:35
29+
$ docker pull ghcr.io/project-chip/chip-build-ameba:42
3030

3131
- Run docker container:
3232

33-
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
33+
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
3434

3535
- Setup build environment:
3636

‎examples/lighting-app/ameba/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ The CHIP demo application is supported on
2323

2424
- Pull docker image:
2525

26-
$ docker pull ghcr.io/project-chip/chip-build-ameba:35
26+
$ docker pull ghcr.io/project-chip/chip-build-ameba:42
2727

2828
- Run docker container:
2929

30-
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
30+
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
3131

3232
- Setup build environment:
3333

‎examples/lighting-app/cc13x4_26x4/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
5858

5959
```
6060
$ cd ~
61-
$ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
62-
$ chmod +x sysconfig-1.16.2_3028-setup.run
63-
$ ./sysconfig-1.16.2_3028-setup.run
61+
$ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.18.1.3343/sysconfig-1.18.1_3343-setup.run
62+
$ chmod +x sysconfig-1.18.1_3343-setup.run
63+
$ ./sysconfig-1.18.1_3343-setup.run
6464
```
6565
6666
- Run the bootstrap script to setup the build environment.
@@ -87,13 +87,13 @@ Ninja to build the executable.
8787
- Run the build to produce a default executable. By default on Linux both the
8888
TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
8989
home directory, and you must provide the absolute path to them. For example
90-
`/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
90+
`/home/username/ti/sysconfig_1.18.1`. On Windows the default directory is
9191
`C:\ti`. Take note of this install path, as it will be used in the next
9292
step.
9393
9494
```
9595
$ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
96-
$ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
96+
$ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
9797
$ ninja -C out/debug
9898
9999
```
@@ -103,7 +103,7 @@ Ninja to build the executable.
103103
104104
105105
```
106-
gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
106+
gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
107107
```
108108
109109
## Programming

‎examples/lock-app/cc13x4_26x4/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
5959

6060
```
6161
$ cd ~
62-
$ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
63-
$ chmod +x sysconfig-1.16.2_3028-setup.run
64-
$ ./sysconfig-1.16.2_3028-setup.run
62+
$ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.18.1.3343/sysconfig-1.18.1_3343-setup.run
63+
$ chmod +x sysconfig-1.18.1_3343-setup.run
64+
$ ./sysconfig-1.18.1_3343-setup.run
6565
```
6666
6767
- Run the bootstrap script to setup the build environment.
@@ -88,15 +88,15 @@ Ninja to build the executable.
8888
- Run the build to produce a default executable. By default on Linux both the
8989
TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
9090
home directory, and you must provide the absolute path to them. For example
91-
`/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
91+
`/home/username/ti/sysconfig_1.18.1`. On Windows the default directory is
9292
`C:\ti`. Take note of this install path, as it will be used in the next
9393
step.
9494
9595
```
9696
$ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
9797
OR
9898
$ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
99-
$ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
99+
$ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
100100
$ ninja -C out/debug
101101
102102
```
@@ -106,7 +106,7 @@ Ninja to build the executable.
106106
107107
108108
```
109-
gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
109+
gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
110110
```
111111
112112
## Programming

‎examples/ota-requestor-app/ameba/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities.
66

77
- Pull docker image:
88

9-
$ docker pull ghcr.io/project-chip/chip-build-ameba:35
9+
$ docker pull ghcr.io/project-chip/chip-build-ameba:42
1010

1111
- Run docker container:
1212

13-
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
13+
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
1414

1515
- Setup build environment:
1616

‎examples/pigweed-app/ameba/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ following features are available:
3131

3232
- Pull docker image:
3333

34-
$ docker pull ghcr.io/project-chip/chip-build-ameba:35
34+
$ docker pull ghcr.io/project-chip/chip-build-ameba:42
3535

3636
- Run docker container:
3737

38-
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
38+
$ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
3939

4040
- Setup build environment:
4141

‎examples/platform/esp32/lock/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#define APP_LOCK_BUTTON GPIO_NUM_34
2828
#define APP_FUNCTION_BUTTON GPIO_NUM_35
29-
#elif CONFIG_IDF_TARGET_ESP32C3
29+
#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
3030
#define SYSTEM_STATE_LED GPIO_NUM_8
3131
#define LOCK_STATE_LED GPIO_NUM_9
3232

0 commit comments

Comments
 (0)