app: Handle TFM config changes

TF-M/PSA configuration changed in
nrfconnect/sdk-nrf#26777

TF-M default profile changed from CONFIG_TFM_PROFILE_TYPE_MINIMAL
to CONFIG_TFM_PROFILE_TYPE_NOT_SET.
SM will use minimal profile by default but basic profile (not set)
is needed for SHA256 crypto for full modem fota support,
which then also needs a different partition layout for TF-M.

Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>

Author: trantanen

app/overlay-full_fota.conf

@@ -13,6 +13,7 @@ CONFIG_SPI_NOR=y
 CONFIG_DFU_TARGET_STREAM=y
 CONFIG_DFU_TARGET_FULL_MODEM=y
 CONFIG_FMFU_FDEV_SKIP_PREVALIDATION=n
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MBEDTLS_SHA256_C=y
 CONFIG_FMFU_FDEV=y

app/pm_static_nrf9151dk_nrf9151_ns_full_fota.yml

@@ -0,0 +1,144 @@
+# Partition manager configuration for full modem FOTA with
+# CONFIG_TFM_PROFILE_TYPE_NOT_SET.
+# TODO: PPP+CMUX doesn't fit with this configuration at the moment.
+#       Partition table has to be optimized later.
+app:
+  address: 0x38000
+  end_address: 0x7e000
+  placement:
+    align:
+      start: 0x8000
+  region: flash_primary
+  size: 0x46000
+mcuboot:
+  address: 0x0
+  end_address: 0x10000
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  end_address: 0x10200
+  placement:
+    align:
+      start: 0x8000
+  region: flash_primary
+  size: 0x200
+mcuboot_primary:
+  address: 0x10000
+  end_address: 0x86000
+  region: flash_primary
+  sharers: 0x1
+  size: 0x76000
+  span:
+  - tfm
+  - app
+  - mcuboot_pad
+mcuboot_primary_app:
+  address: 0x10200
+  end_address: 0x86000
+  region: flash_primary
+  size: 0x75e00
+  span:
+  - app
+  - tfm
+mcuboot_secondary:
+  address: 0x86000
+  end_address: 0xfc000
+  region: flash_primary
+  share_size:
+  - mcuboot_primary
+  size: 0x76000
+mcuboot_sram:
+  address: 0x20000000
+  end_address: 0x20006000
+  region: sram_primary
+  size: 0x6000
+  span:
+  - tfm_sram
+nonsecure_storage:
+  address: 0xfc000
+  end_address: 0x100000
+  region: flash_primary
+  size: 0x4000
+  span:
+  - settings_storage
+otp:
+  address: 0xff8108
+  end_address: 0xff83fc
+  region: otp
+  size: 0x2f4
+settings_storage:
+  address: 0xfc000
+  end_address: 0x100000
+  inside:
+  - nonsecure_storage
+  region: flash_primary
+  size: 0x4000
+sram_secure:
+  address: 0x20000000
+  end_address: 0x20016000
+  region: sram_primary
+  size: 0x16000
+  span:
+  - tfm_sram
+tfm:
+  address: 0x10200
+  end_address: 0x38000
+  inside:
+  - mcuboot_primary_app
+  region: flash_primary
+  size: 0x27e00
+tfm_its:
+  address: 0x7e000
+  end_address: 0x80000
+  inside:
+  - tfm_storage
+  region: flash_primary
+  size: 0x2000
+tfm_nonsecure:
+  address: 0x38000
+  end_address: 0x7e000
+  placement:
+    align:
+      start: 0x8000
+  region: flash_primary
+  size: 0x46000
+  span:
+  - app
+tfm_otp_nv_counters:
+  address: 0x80000
+  end_address: 0x82000
+  inside:
+  - tfm_storage
+  region: flash_primary
+  size: 0x2000
+tfm_ps:
+  address: 0x82000
+  end_address: 0x86000
+  inside:
+  - tfm_storage
+  region: flash_primary
+  size: 0x4000
+tfm_secure:
+  address: 0x10200
+  end_address: 0x38000
+  region: flash_primary
+  size: 0x27e00
+  span:
+  - tfm
+tfm_sram:
+  address: 0x20000000
+  end_address: 0x20016000
+  inside:
+  - sram_secure
+  region: sram_primary
+  size: 0x16000
+tfm_storage:
+  address: 0x7e000
+  end_address: 0x86000
+  region: flash_primary
+  size: 0x8000
+  span:
+  - tfm_its
+  - tfm_otp_nv_counters
+  - tfm_ps

app/prj.conf

@@ -117,8 +117,9 @@ CONFIG_AT_MONITOR=y
 # Eventfd's to use with AT-commands.
 CONFIG_ZVFS_EVENTFD_MAX=2
 
-# Disable TF-M logging.
-# TF-M log sending will block until remote end is ready, when HWFC is used on UART1.
+# TF-M
+CONFIG_TFM_PROFILE_TYPE_MINIMAL=y
+# Disable TF-M log sending as it will block until remote end is ready, when HWFC is used on UART1.
 CONFIG_TFM_LOG_LEVEL_SILENCE=y
 
 #

app/sample.yaml

@@ -123,6 +123,7 @@ tests:
     build_only: true
     extra_args:
       - EXTRA_CONF_FILE="overlay-full_fota.conf"
+      - PM_STATIC_YML_FILE=pm_static_nrf9151dk_nrf9151_ns_full_fota.yml
     extra_configs:
       - CONFIG_SM_DFU_MODEM_FULL=y
     platform_allow:

doc/app/at_fota.rst

@@ -33,7 +33,8 @@ Syntax
   * ``1`` - Start FOTA for application update.
   * ``2`` - Start FOTA for modem delta update.
   * ``3`` - Start FOTA for full modem update.
-    Can only be used when the :file:`overlay-full_fota.conf` configuration file is used.
+    Can only be used when the :file:`overlay-full_fota.conf` configuration file and
+    :file:`PM_STATIC_YML_FILE=pm_static_nrf9151dk_nrf9151_ns_full_fota.yml` compile option are used.
 
     Not supported on the Thingy:91 X.
 

doc/app/sm_configuration.rst

@@ -307,5 +307,9 @@ The following configuration files are provided:
   This is needed when capturing modem traces and application debug logs simultaneously.
   See the :ref:`sm_logging` documentation for more information.
 
+* :file:`pm_static_nrf9151dk_nrf9151_ns_full_fota.yml` - Partition manager static configuration for full modem FOTA functionality.
+  Use PM_STATIC_YML_FILE=pm_static_nrf9151dk_nrf9151_ns_full_fota.yml compile option to add this file into the build.
+  See the :ref:`SM_AT_FOTA` for more information.
+
 The board-specific devicetree overlays (:file:`boards/*.overlay`) set up configurations that are specific to each supported development kit.
 All of them configure the DTR to be deasserted from a button and RI to blink an LED.