samples: matter: Add support for non-PM builds (excluding nrf5340/nrf9160)#25646
samples: matter: Add support for non-PM builds (excluding nrf5340/nrf9160)#25646nordicjm wants to merge 8 commits into
Conversation
CI InformationTo view the history of this post, click the 'edited' button above Inputs:Sources:sdk-nrf: PR head: 61d93cb1804e776812ba1eda60fdf11630519e9d more detailssdk-nrf:
matter:
Github labels
List of changed files detected by CI (217)Outputs:ToolchainVersion: 42e1724fc9 Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
|
What is the story behind this PR? Do we need a new board target in order to stop using PM in the future? And why is it only for nRF52840? |
|
Suggest to have nrf54l15 or nrf54lm20a if you want to check if the changes affect sample within the Jenkins Integration plan (due to you resource constraints, on-target tests are limited to nrf54lm20dk, nrf54l15dk and nrf7002dk platforms) |
This should have been opened as draft with just @rghaddab added but I opened it as ready for review by mistake. It shows an initial port for the nrf52840 only, it doesn't work because of 2 matter bugs (referenced above) which include non-existent SUIT/PM things |
fdcfe40 to
f4ba2c5
Compare
|
The following west manifest projects have changed revision in this Pull Request:
⛔ DNM label due to: 1 project with PR revision Note: This message is automatically posted and updated by the Manifest GitHub Action. |
f4ba2c5 to
3b780a5
Compare
3b780a5 to
345b027
Compare
345b027 to
627a0ad
Compare
| Enables merging the generated factory data with the merged.hex output build file. As a | ||
| result, the merged.hex build output file, which is used when flashing the firmware using | ||
| the west tool, includes the factory data as well. | ||
| #config MATTER_FACTORY_DATA_MERGE_WITH_FIRMWARE |
There was a problem hiding this comment.
We must have this option.
|
|
||
| # Do not apply shield or snippets for the factory data partition and use an empty file for the | ||
| # board defconfig file | ||
| set(BOARD_DEFCONFIG ${CMAKE_CURRENT_SOURCE_DIR}/prj.conf) |
There was a problem hiding this comment.
This approach makes no sense. There are only weird hacks and overrides for the process that relies only on CMAKE.
I don't see any advantage in creating a separate image for factory data. This only creates many redundant files in the build directory.
Instead align this PR to this approach: #26394
There was a problem hiding this comment.
This approach makes no sense. There are only weird hacks and overrides for the process that relies only on CMAKE.
You're not a build system maintainer, these are not hacks.
I don't see any advantage in creating a separate image for factory data. This only creates many redundant files in the build directory.
Instead align this PR to this approach: #26394
This is the approach and this is how it is going to be done, just like it is for other images and other systems e.g. in zephyr, in bare metal, etc.
There was a problem hiding this comment.
You're not a build system maintainer, these are not hacks.
Similarly, it's not within your scope to decide how Matter factory data should work, as you're not the Matter maintainer. This solution was only mentioned but never consulted with us.
This is the approach and this is how it is going to be done, just like it is for other images and other systems e.g. in zephyr, in bare metal, etc.
Can you point me to where this was decided and by whom? I'm curious why I wasn't consulted on this.
fb701f7 to
761e400
Compare
761e400 to
d0d5d07
Compare
|
You can find the documentation preview for this PR here. |
Fixes an invalid path to a source file Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Includes changes for partition removal Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This adds an image which sysbuild can add which simply flashes a hex file Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Adds dtsi files which can be included and set the partition layout up for the matter samples Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Includes nrf52840dk, nrf54l15dk (secure only) and nrf54lm20dk Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
We need to use the new CONFIG_CHIP_APP_ZAP_DIR to set the proper path to the custom zap-generated directory in Matter stack. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
TF-M is currently not supported without partition manager, do not force disabling PM if a non-secure board target is used in samples that build for these Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Allows generating and flashing the nrf70 firmware in applications which do not use partition manager, and will be flashed when west flash is invoked Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
d0d5d07 to
61d93cb
Compare
ArekBalysNordic
left a comment
There was a problem hiding this comment.
Detected the following inconsistencies:
| CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 | ||
|
|
||
| # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). | ||
| CONFIG_BOOT_MAX_IMG_SECTORS=512 |
There was a problem hiding this comment.
Lack of consistency with the Matter template sample. This line is still there. However, you removed it from here.
| * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
| */ | ||
|
|
||
| /* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ |
There was a problem hiding this comment.
This part is still in the nrf54l15dk_nrf54l15_cpuapp.overlay within this directory - inconsistency.
Note: this is now your (your as in your team - matter) PR for you to take and fix up and get everything working, not mine, so these are your tasks |
|
This pull request has been marked as stale because it has been open (more than) 30 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 7 days. Note, that you can always re-open a closed pull request at any time. |
Includes configuration for matter samples also
Blocked by NCSDK-36367 and NCSDK-36368