samples: matter: Fix Matter SUIT manifest templates

In the manifest templates for RAD and APP the candidate verification instruction must be after installing the new image, whereas it was before it. There were wrong conditions to define CACHE images. Signed-off-by: Arkadiusz Balys <[email protected]>
nrfconnect · Oct 14, 2024 · c9b3a87 · c9b3a87
1 parent 7105475
commit c9b3a87
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 54 deletions.
diff --git a/config/suit/templates/nrf54h20/matter/v1/app_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/matter/v1/app_envelope.yaml.jinja2
@@ -21,7 +21,7 @@ SUIT_Envelope_Tagged:
         - {{ application['dt'].chosen_nodes['zephyr,code-partition'].regs[0].size }}
       - - CAND_IMG
         - 0
-{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE' not in application['config'] or application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE'] == '' %}
+{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE' in application['config'] and application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE'] != '' %}
       - - CACHE_POOL
         - 1
 {%- endif %}
@@ -88,32 +88,6 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-    suit-candidate-verification:
-    - suit-directive-set-component-index: 1
-    - suit-directive-override-parameters:
-{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI' in application['config'] and application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] != '' %}
-        suit-parameter-uri: '{{ application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] }}'
-{%- else %}
-        suit-parameter-uri: 'file://{{ application['filename'] }}'
-{%- endif %}
-        suit-parameter-image-digest:
-          suit-digest-algorithm-id: cose-alg-sha-256
-          suit-digest-bytes:
-            file: {{ application['binary'] }}
-    - suit-directive-fetch:
-      - suit-send-record-failure
-    - suit-directive-try-each:
-      - - suit-condition-image-match:
-          - suit-send-record-success
-          - suit-send-record-failure
-          - suit-send-sysinfo-success
-          - suit-send-sysinfo-failure
-      - - suit-condition-image-match:
-          - suit-send-record-success
-          - suit-send-record-failure
-          - suit-send-sysinfo-success
-          - suit-send-sysinfo-failure
-
 {%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE' not in application['config'] or application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE'] == '' %}
     suit-payload-fetch:
     - suit-directive-set-component-index: 2
@@ -182,6 +156,32 @@ SUIT_Envelope_Tagged:
     suit-text:
       suit-digest-algorithm-id: cose-alg-sha-256
 
+    suit-candidate-verification:
+    - suit-directive-set-component-index: 1
+    - suit-directive-override-parameters:
+{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI' in application['config'] and application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] != '' %}
+        suit-parameter-uri: '{{ application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] }}'
+{%- else %}
+        suit-parameter-uri: 'file://{{ application['filename'] }}'
+{%- endif %}
+        suit-parameter-image-digest:
+          suit-digest-algorithm-id: cose-alg-sha-256
+          suit-digest-bytes:
+            file: {{ application['binary'] }}
+    - suit-directive-fetch:
+      - suit-send-record-failure
+    - suit-directive-try-each:
+      - - suit-condition-image-match:
+          - suit-send-record-success
+          - suit-send-record-failure
+          - suit-send-sysinfo-success
+          - suit-send-sysinfo-failure
+      - - suit-condition-image-match:
+          - suit-send-record-success
+          - suit-send-record-failure
+          - suit-send-sysinfo-success
+          - suit-send-sysinfo-failure
+
     suit-manifest-component-id:
     - INSTLD_MFST
     - RFC4122_UUID:

diff --git a/config/suit/templates/nrf54h20/matter/v1/rad_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/matter/v1/rad_envelope.yaml.jinja2
@@ -26,7 +26,7 @@ SUIT_Envelope_Tagged:
         - {{ radio['dt'].chosen_nodes['zephyr,code-partition'].regs[0].size }}
       - - CAND_IMG
         - 0
-{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE' not in application['config'] or application['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE'] == '' %}
+{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE' in radio['config'] and radio['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE'] != '' %}
       - - CACHE_POOL
         - 1
 {%- endif %}
@@ -79,32 +79,6 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-    suit-candidate-verification:
-    - suit-directive-set-component-index: 1
-    - suit-directive-override-parameters:
-{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI' in radio['config'] and radio['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] != '' %}
-        suit-parameter-uri: '{{ radio['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] }}'
-{%- else %}
-        suit-parameter-uri: '#{{ radio['name'] }}'
-{%- endif %}
-        suit-parameter-image-digest:
-          suit-digest-algorithm-id: cose-alg-sha-256
-          suit-digest-bytes:
-            file: {{ radio['binary'] }}
-    - suit-directive-fetch:
-      - suit-send-record-failure
-    - suit-directive-try-each:
-      - - suit-condition-image-match:
-          - suit-send-record-success
-          - suit-send-record-failure
-          - suit-send-sysinfo-success
-          - suit-send-sysinfo-failure
-      - - suit-condition-image-match:
-          - suit-send-record-success
-          - suit-send-record-failure
-          - suit-send-sysinfo-success
-          - suit-send-sysinfo-failure
-
 {%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE' not in radio['config'] or radio['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE'] == '' %}
     suit-payload-fetch:
     - suit-directive-set-component-index: 2
@@ -140,6 +114,33 @@ SUIT_Envelope_Tagged:
       - suit-send-sysinfo-failure
     suit-text:
       suit-digest-algorithm-id: cose-alg-sha-256
+
+    suit-candidate-verification:
+    - suit-directive-set-component-index: 1
+    - suit-directive-override-parameters:
+{%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI' in radio['config'] and radio['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] != '' %}
+        suit-parameter-uri: '{{ radio['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] }}'
+{%- else %}
+        suit-parameter-uri: '#{{ radio['name'] }}'
+{%- endif %}
+        suit-parameter-image-digest:
+          suit-digest-algorithm-id: cose-alg-sha-256
+          suit-digest-bytes:
+            file: {{ radio['binary'] }}
+    - suit-directive-fetch:
+      - suit-send-record-failure
+    - suit-directive-try-each:
+      - - suit-condition-image-match:
+          - suit-send-record-success
+          - suit-send-record-failure
+          - suit-send-sysinfo-success
+          - suit-send-sysinfo-failure
+      - - suit-condition-image-match:
+          - suit-send-record-success
+          - suit-send-record-failure
+          - suit-send-sysinfo-success
+          - suit-send-sysinfo-failure
+
     suit-manifest-component-id:
     - INSTLD_MFST
     - RFC4122_UUID: