samples: cellular: nrf_cloud_coap_fota: Disable Partition Manager

lucasvdp · lucasvdp · commit 570214c2444a · 2026-05-29T12:46:24.000+02:00
Add Devicetree partitions and disable partition manager.

Signed-off-by: Lucas van der Ploeg &lt;lucas.vanderploeg@nordicsemi.no&gt;
diff --git a/samples/cellular/nrf_cloud_coap_fota/Kconfig.sysbuild b/samples/cellular/nrf_cloud_coap_fota/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2026 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+config PARTITION_MANAGER
+	default n
+
+source "share/sysbuild/Kconfig"
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/nrf9151dk_nrf9151_ns.overlay b/samples/cellular/nrf_cloud_coap_fota/boards/nrf9151dk_nrf9151_ns.overlay
@@ -6,11 +6,26 @@
 
 / {
 	chosen {
-		nordic,pm-ext-flash = &gd25wb256;
+		nordic,fmfu-storage-partition = &fmfu_storage_partition;
 	};
 };
 
+#include <samples/cellular/nrf91_immutable_bootloader_partitions.dtsi>
+
 /* External flash device is disabled by default */
 &gd25wb256 {
 	status = "okay";
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		fmfu_storage_partition: partition@0 {
+			label = "fmfu_storage";
+			reg = <0x00000000 0x400000>;
+		};
+	};
 };
+
+#include <samples/cellular/nrf91_sram_partitions.dtsi>
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/nrf9160dk_nrf9160_ns.overlay b/samples/cellular/nrf_cloud_coap_fota/boards/nrf9160dk_nrf9160_ns.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		nordic,fmfu-storage-partition = &fmfu_storage_partition;
+	};
+};
+
+#include <samples/cellular/nrf91_immutable_bootloader_partitions.dtsi>
+
+/* External flash device is disabled by default */
+&mx25r64 {
+	status = "okay";
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		fmfu_storage_partition: partition@0 {
+			label = "fmfu_storage";
+			reg = <0x00000000 0x400000>;
+		};
+	};
+};
+
+#include <samples/cellular/nrf91_sram_partitions.dtsi>
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay b/samples/cellular/nrf_cloud_coap_fota/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/nrf9161dk_nrf9161_ns.overlay b/samples/cellular/nrf_cloud_coap_fota/boards/nrf9161dk_nrf9161_ns.overlay
@@ -6,11 +6,26 @@
 
 / {
 	chosen {
-		nordic,pm-ext-flash = &gd25wb256;
+		nordic,fmfu-storage-partition = &fmfu_storage_partition;
 	};
 };
 
+#include <samples/cellular/nrf91_immutable_bootloader_partitions.dtsi>
+
 /* External flash device is disabled by default */
 &gd25wb256 {
 	status = "okay";
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		fmfu_storage_partition: partition@0 {
+			label = "fmfu_storage";
+			reg = <0x00000000 0x400000>;
+		};
+	};
 };
+
+#include <samples/cellular/nrf91_sram_partitions.dtsi>
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/nrf9161dk_nrf9161_ns_0_7_0.overlay b/samples/cellular/nrf_cloud_coap_fota/boards/nrf9161dk_nrf9161_ns_0_7_0.overlay
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/thingy91x_nrf9151_ns.conf b/samples/cellular/nrf_cloud_coap_fota/boards/thingy91x_nrf9151_ns.conf
@@ -10,5 +10,3 @@
 
 # Enable external flash
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
-CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
-CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
diff --git a/samples/cellular/nrf_cloud_coap_fota/boards/thingy91x_nrf9151_ns.overlay b/samples/cellular/nrf_cloud_coap_fota/boards/thingy91x_nrf9151_ns.overlay
@@ -8,4 +8,8 @@
 	aliases {
 		ext-flash = &flash_ext;
 	};
+
+	chosen {
+		nordic,fmfu-storage-partition = &fmfu_storage_partition;
+	};
 };
diff --git a/samples/cellular/nrf_cloud_coap_fota/full_modem_fota.conf b/samples/cellular/nrf_cloud_coap_fota/full_modem_fota.conf
@@ -4,17 +4,15 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# NOT_SET profile is needed for SHA-256 support for full modem update
-# but disable some features to reduce the size TF-M takes.
-CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
-CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE=n
+# Decrease buffer to make it work with minimal TF-M.
+CONFIG_NRF_CLOUD_FOTA_FULL_MODEM_UPDATE_BUF_SIZE=1024
+CONFIG_TFM_LOG_LEVEL_SILENCE=y
 
 # Full Modem FOTA
 CONFIG_NRF_CLOUD_FOTA_FULL_MODEM_UPDATE=y
 CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # FMFU requires additional heap space.
 # If the heap is too small, a boot loop can occur when the full modem image is installed.
diff --git a/samples/cellular/nrf_cloud_coap_fota/prj.conf b/samples/cellular/nrf_cloud_coap_fota/prj.conf
@@ -51,7 +51,6 @@ CONFIG_STREAM_FLASH=y
 CONFIG_MCUBOOT_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
 CONFIG_SECURE_BOOT=y
-CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n
 
 # Settings
 CONFIG_FLASH=y
diff --git a/samples/cellular/nrf_cloud_coap_fota/sample.yaml b/samples/cellular/nrf_cloud_coap_fota/sample.yaml
@@ -36,7 +36,7 @@ tests:
       - sysbuild
       - ci_samples_cellular
     extra_args:
-      - -DEXTRA_CONF_FILE=full_modem_fota.conf
+      - EXTRA_CONF_FILE=full_modem_fota.conf
   sample.cellular.nrf_cloud_coap_fota_smp:
     sysbuild: true
     build_only: true
@@ -49,5 +49,5 @@ tests:
       - sysbuild
       - ci_samples_cellular
     extra_args:
-      - -DEXTRA_CONF_FILE=smp_fota.conf
-      - -DDTC_OVERLAY_FILE=nrf9160dk_mcumgr_client_uart2.overlay
+      - EXTRA_CONF_FILE=smp_fota.conf
+      - EXTRA_DTC_OVERLAY_FILE=nrf9160dk_mcumgr_client_uart2.overlay
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/boards/nrf9151dk_nrf9151.overlay b/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/boards/nrf9151dk_nrf9151.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../../../boards/nrf9151dk_nrf9151_ns.overlay"
+
+&sram0_s {
+	reg = <0x0 0x40000>;
+};
+
+/ {
+	chosen {
+		zephyr,code-partition = &b0_partition;
+	};
+};
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/boards/nrf9160dk_nrf9160.overlay b/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/boards/nrf9160dk_nrf9160.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../../../boards/nrf9160dk_nrf9160_ns.overlay"
+
+&sram0_s {
+	reg = <0x0 0x40000>;
+};
+
+/ {
+	chosen {
+		zephyr,code-partition = &b0_partition;
+	};
+};
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/boards/nrf9161dk_nrf9161.overlay b/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/boards/nrf9161dk_nrf9161.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../../../boards/nrf9161dk_nrf9161_ns.overlay"
+
+&sram0_s {
+	reg = <0x0 0x40000>;
+};
+
+/ {
+	chosen {
+		zephyr,code-partition = &b0_partition;
+	};
+};
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/prj.conf b/samples/cellular/nrf_cloud_coap_fota/sysbuild/b0/prj.conf
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# b0 defaults from /samples/bootloader/prj.conf
+
+CONFIG_IS_SECURE_BOOTLOADER=y
+CONFIG_MULTITHREADING=n
+CONFIG_GPIO=n
+CONFIG_ARM_MPU=n
+CONFIG_TICKLESS_KERNEL=n
+CONFIG_ERRNO=n
+CONFIG_FPROTECT=y
+CONFIG_SECURE_BOOT_CRYPTO=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_LOG_DEFAULT_LEVEL=0
+CONFIG_SECURE_BOOT_VALIDATION=y
+CONFIG_SECURE_BOOT_VALIDATION_LOG_LEVEL_INF=y
+CONFIG_SECURE_BOOT_STORAGE=y
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_TIMEOUT_64BIT=n
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Disable asserts because of false positive when writing to OTP.
+CONFIG_ASSERT=n
+
+# Avoid triggering IRQs from the RTC
+CONFIG_NRF_RTC_TIMER=n
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay b/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../../../boards/nrf9151dk_nrf9151_ns.overlay"
+
+/ {
+	chosen {
+		zephyr,code-partition = &boot_partition;
+	};
+};
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/boards/nrf9160dk_nrf9160.overlay b/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/boards/nrf9160dk_nrf9160.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../../../boards/nrf9160dk_nrf9160_ns.overlay"
+
+/ {
+	chosen {
+		zephyr,code-partition = &boot_partition;
+	};
+};
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay b/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../../../boards/nrf9161dk_nrf9161_ns.overlay"
+
+/ {
+	chosen {
+		zephyr,code-partition = &boot_partition;
+	};
+};
diff --git a/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_coap_fota/sysbuild/mcuboot/prj.conf
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2026 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Copied from bootloader/mcuboot/boot/zephyr/prj.conf
+
+CONFIG_MAIN_STACK_SIZE=10240
+
+CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
+CONFIG_BOOT_ENCRYPT_IMAGE=n
+
+CONFIG_BOOT_UPGRADE_ONLY=n
+CONFIG_BOOT_BOOTSTRAP=n
+
+### mbedTLS has its own heap
+# CONFIG_HEAP_MEM_POOL_SIZE is not set
+
+CONFIG_FLASH=y
+
+### Various Zephyr boards enable features that we don't want.
+# CONFIG_BT is not set
+# CONFIG_I2C is not set
+
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+### Ensure Zephyr logging changes don't use more resources
+CONFIG_LOG_DEFAULT_LEVEL=0
+### Use info log level by default
+CONFIG_MCUBOOT_LOG_LEVEL_INF=y
+### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y
+CONFIG_CBPRINTF_NANO=y
+### Use picolibc to reduce flash usage
+CONFIG_PICOLIBC=y
+### Disable malloc arena because we don't need it
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
+
+# NCS boot banner
+CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot"
