suit: Remove suit-install-legacy

tomchy · tomchy · commit 2537529a261e · 2024-12-12T10:44:45.000+01:00
Remove usage of suit-install-legacy from manifest templates.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz &lt;tomasz.chyrowicz@nordicsemi.no&gt;
diff --git a/config/suit/templates/nrf54h20/default/v1/app_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/app_envelope.yaml.jinja2
@@ -74,12 +74,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if application['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Application DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - 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'] != '' %}
diff --git a/config/suit/templates/nrf54h20/default/v1/app_recovery_envelope_app_local.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/app_recovery_envelope_app_local.yaml.jinja2
@@ -122,12 +122,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if application['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Application DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
 {%- if rad_recovery is defined %}
     - suit-directive-set-component-index: 0
     - suit-directive-override-parameters:
diff --git a/config/suit/templates/nrf54h20/default/v1/app_recovery_envelope_direct.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/app_recovery_envelope_direct.yaml.jinja2
@@ -141,12 +141,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if application['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Application DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
 {%- if rad_recovery is defined %}
     - suit-directive-set-component-index: 1
     - suit-directive-override-parameters:
diff --git a/config/suit/templates/nrf54h20/default/v1/app_recovery_local_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/app_recovery_local_envelope.yaml.jinja2
@@ -80,12 +80,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if application['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Application DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - suit-directive-set-component-index: 1
     - suit-directive-override-parameters:
 {%- if 'CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI' in app_recovery_img['config'] and app_recovery_img['config']['CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE_URI'] != '' %}
diff --git a/config/suit/templates/nrf54h20/default/v1/rad_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/rad_envelope.yaml.jinja2
@@ -79,12 +79,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if radio['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Radio DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - 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'] != '' %}
diff --git a/config/suit/templates/nrf54h20/default/v1/rad_recovery_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/rad_recovery_envelope.yaml.jinja2
@@ -70,12 +70,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if radio['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Radio DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - suit-directive-set-component-index: 1
     - suit-directive-override-parameters:
         suit-parameter-uri: '#{{ rad_recovery['name'] }}'
diff --git a/config/suit/templates/nrf54h20/default/v1/root_with_binary_nordic_top.yaml.jinja2 b/config/suit/templates/nrf54h20/default/v1/root_with_binary_nordic_top.yaml.jinja2
@@ -138,12 +138,7 @@ SUIT_Envelope_Tagged:
     suit-current-version: {{ DEFAULT_VERSION }}
 {%- endif %}
 
-{%- if main_config['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Main DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - suit-directive-set-component-index: 0
 {%- if radio is defined %}
     - suit-directive-override-parameters:
diff --git a/config/suit/templates/nrf54h20/matter/v1/app_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/matter/v1/app_envelope.yaml.jinja2
@@ -97,12 +97,7 @@ SUIT_Envelope_Tagged:
       - suit-send-record-failure
 {%- endif %}
 
-{%- if application['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Application DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - 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'] != '' %}
diff --git a/config/suit/templates/nrf54h20/matter/v1/rad_envelope.yaml.jinja2 b/config/suit/templates/nrf54h20/matter/v1/rad_envelope.yaml.jinja2
@@ -88,12 +88,7 @@ SUIT_Envelope_Tagged:
       - suit-send-record-failure
 {%- endif %}
 
-{%- if radio['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Radio DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - 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'] != '' %}
diff --git a/config/suit/templates/nrf54h20/matter/v1/root_with_binary_nordic_top.yaml.jinja2 b/config/suit/templates/nrf54h20/matter/v1/root_with_binary_nordic_top.yaml.jinja2
@@ -156,12 +156,7 @@ SUIT_Envelope_Tagged:
       - suit-send-sysinfo-failure
 {%- endif %}
 
-{%- if main_config['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Main DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - suit-directive-set-component-index: 0
 {%- if application is defined %}
     - suit-directive-override-parameters:
diff --git a/samples/suit/smp_transfer/suit/nrf54h20/app_envelope_extflash.yaml.jinja2 b/samples/suit/smp_transfer/suit/nrf54h20/app_envelope_extflash.yaml.jinja2
@@ -99,12 +99,7 @@ SUIT_Envelope_Tagged:
       - suit-send-record-failure
 {%- endif %}
 
-{%- if application['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Application DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
 {%- if flash_companion is defined %}
     - suit-directive-set-component-index: 1
     - suit-directive-override-parameters:
diff --git a/samples/suit/smp_transfer/suit/nrf54h20/rad_envelope_extflash.yaml.jinja2 b/samples/suit/smp_transfer/suit/nrf54h20/rad_envelope_extflash.yaml.jinja2
@@ -90,12 +90,7 @@ SUIT_Envelope_Tagged:
       - suit-send-record-failure
 {%- endif %}
 
-{%- if radio['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Radio DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - 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'] != '' %}
diff --git a/samples/suit/smp_transfer/suit/nrf54h20/root_with_binary_nordic_top_extflash.yaml.jinja2 b/samples/suit/smp_transfer/suit/nrf54h20/root_with_binary_nordic_top_extflash.yaml.jinja2
@@ -156,12 +156,7 @@ SUIT_Envelope_Tagged:
       - suit-send-sysinfo-failure
 {%- endif %}
 
-{%- if main_config['dt'].label2node['suit_storage_partition'].regs[0].size == 24576 %}
-    # Main DTS contains larger SUIT storage - use legacy encoding
-    suit-install-legacy:
-{%- else %}
     suit-install:
-{%- endif %}
     - suit-directive-set-component-index: 0
 {%- if nordic_top %}
     - suit-directive-override-parameters:
