Skip to content

Commit

Permalink
samples: matter: Fix SUIT envelope template paths
Browse files Browse the repository at this point in the history 
We had the wrong paths set to the common SUIT envelope templates
caused by the wrong SUIT CMake variable management and we could
not use the ${ZEPHYR_NRF_MODULE_DIR} variable within prj.conf
files.

After fixing theSUIT CMake file, in this commit, we switched to
using the proper paths.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
  • Loading branch information
@ArekBalysNordic @rlubos
ArekBalysNordic authored and rlubos committed Jul 15, 2024
1 parent f3c1fb4 commit 9510f26
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ CONFIG_CHIP_FACTORY_DATA=n
# TODO: Workaround to be removed once Zephyr's CONFIG_FPROTECT is supported on nRF54H20.
CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n

# Set SUIT template paths
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}../common/suit_templates/app_envelope.yaml.jinja2"
# Use common SUIT envelope templates prepared for Matter purpose
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/suit_templates/app_envelope.yaml.jinja2"
4 changes: 2 additions & 2 deletions samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ CONFIG_IPC_RADIO_BT=y
CONFIG_IPC_RADIO_BT_HCI_IPC=y
CONFIG_IPC_RADIO_802154=y

# Set SUIT template paths
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}../common/suit_templates/rad_envelope.yaml.jinja2"
# Use common SUIT envelope templates prepared for Matter purpose
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/suit_templates/rad_envelope.yaml.jinja2"
4 changes: 2 additions & 2 deletions samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ CONFIG_CHIP_FACTORY_DATA=n
# TODO: Workaround to be removed once Zephyr's CONFIG_FPROTECT is supported on nRF54H20.
CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n

# Set SUIT template paths
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}../common/suit_templates/app_envelope.yaml.jinja2"
# Use common SUIT envelope templates prepared for Matter purpose
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/suit_templates/app_envelope.yaml.jinja2"
4 changes: 2 additions & 2 deletions samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ CONFIG_IPC_RADIO_BT=y
CONFIG_IPC_RADIO_BT_HCI_IPC=y
CONFIG_IPC_RADIO_802154=y

# Set SUIT template paths
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}../common/suit_templates/rad_envelope.yaml.jinja2"
# Use common SUIT envelope templates prepared for Matter purpose
CONFIG_SUIT_ENVELOPE_TEMPLATE="${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/suit_templates/rad_envelope.yaml.jinja2"

0 comments on commit 9510f26

Please sign in to comment.