Skip to content

Commit 0641026

Browse files
ahasztagrlubos
authored andcommitted
suit: Fix external flash template manifest
The radio and application manifests were booted in the wrong order - thus, there was an attempt to fetch the radio manifest, before the flash_companion (started by the app manifest) was booted. Signed-off-by: Artur Hadasz <[email protected]>
1 parent b62e98b commit 0641026

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

samples/suit/smp_transfer/suit/nrf54h20/root_with_binary_nordic_top_extflash.yaml.jinja2

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ SUIT_Envelope_Tagged:
163163
suit-install:
164164
{%- endif %}
165165
- suit-directive-set-component-index: 0
166-
{%- if radio is defined %}
166+
{%- if application is defined %}
167167
- suit-directive-override-parameters:
168-
suit-parameter-uri: '#{{ radio['name'] }}'
168+
suit-parameter-uri: '#{{ application['name'] }}'
169169
- suit-directive-fetch:
170170
- suit-send-record-failure
171171
- suit-condition-dependency-integrity:
@@ -179,9 +179,9 @@ SUIT_Envelope_Tagged:
179179
- suit-send-sysinfo-success
180180
- suit-send-sysinfo-failure
181181
{%- endif %}
182-
{%- if application is defined %}
182+
{%- if radio is defined %}
183183
- suit-directive-override-parameters:
184-
suit-parameter-uri: '#{{ application['name'] }}'
184+
suit-parameter-uri: '#{{ radio['name'] }}'
185185
- suit-directive-fetch:
186186
- suit-send-record-failure
187187
- suit-condition-dependency-integrity:
@@ -214,13 +214,16 @@ SUIT_Envelope_Tagged:
214214

215215
suit-candidate-verification:
216216
- suit-directive-set-component-index: 0
217-
{%- if radio is defined %}
217+
# DO NOT CHANGE THE ORDER OF INSTALLING THE MANIFESTS HERE
218+
# The application manifest boots the flash companion image,
219+
# so it is needed to be processed before the radio image.
220+
{%- if application is defined %}
218221
- suit-directive-override-parameters:
219-
suit-parameter-uri: '#{{ radio['name'] }}'
222+
suit-parameter-uri: '#{{ application['name'] }}'
220223
suit-parameter-image-digest:
221224
suit-digest-algorithm-id: cose-alg-sha-256
222225
suit-digest-bytes:
223-
envelope: {{ artifacts_folder ~ radio['name'] }}.suit
226+
envelope: {{ artifacts_folder ~ application['name'] }}.suit
224227
- suit-directive-fetch:
225228
- suit-send-record-failure
226229
- suit-condition-image-match:
@@ -239,13 +242,13 @@ SUIT_Envelope_Tagged:
239242
- suit-send-sysinfo-success
240243
- suit-send-sysinfo-failure
241244
{%- endif %}
242-
{%- if application is defined %}
245+
{%- if radio is defined %}
243246
- suit-directive-override-parameters:
244-
suit-parameter-uri: '#{{ application['name'] }}'
247+
suit-parameter-uri: '#{{ radio['name'] }}'
245248
suit-parameter-image-digest:
246249
suit-digest-algorithm-id: cose-alg-sha-256
247250
suit-digest-bytes:
248-
envelope: {{ artifacts_folder ~ application['name'] }}.suit
251+
envelope: {{ artifacts_folder ~ radio['name'] }}.suit
249252
- suit-directive-fetch:
250253
- suit-send-record-failure
251254
- suit-condition-image-match:

0 commit comments

Comments
 (0)