app: Fix nRF9151 DK external flash configuration

jtguggedal · jtguggedal · commit cc95b3bd2ced · 2025-02-04T13:17:04.000+01:00
Fix configuration of the external flash used for secondary
MCUboot partition.

Signed-off-by: Jan Tore Guggedal &lt;jantore.guggedal@nordicsemi.no&gt;
diff --git a/app/boards/nrf9151dk_nrf9151_ns.conf b/app/boards/nrf9151dk_nrf9151_ns.conf
@@ -3,3 +3,9 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
+
+# Enable external flash
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
+CONFIG_SPI_NOR_SFDP_DEVICETREE=y
+CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
diff --git a/app/sysbuild/mcuboot/app.overlay b/app/sysbuild/mcuboot/app.overlay
@@ -1,4 +1,10 @@
-/ {
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ / {
 	chosen {
 		zephyr,code-partition = &boot_partition;
 	};
diff --git a/app/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.conf b/app/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.conf
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# MCUboot config to enable secondary slot on the external flash
+
+CONFIG_FLASH=y
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
+CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_SPI_NOR_SFDP_DEVICETREE=y
+
+CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x13E00
+CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+
+CONFIG_MULTITHREADING=y
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_BOOT_MAX_IMG_SECTORS=256
diff --git a/app/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay b/app/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&gd25wb256 {
+	status = "okay";
+};
+
+/ {
+	/* Configure partition manager to use gd25wb256 as the external flash */
+	chosen {
+		zephyr,code-partition = &boot_partition;
+		nordic,pm-ext-flash = &gd25wb256;
+	};
+};
diff --git a/app/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/app/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
@@ -1,3 +1,9 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
 # MCUBoot settings
 CONFIG_BOOT_MAX_IMG_SECTORS=512
 
diff --git a/app/sysbuild/mcuboot/prj.conf b/app/sysbuild/mcuboot/prj.conf
@@ -1,3 +1,9 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
 CONFIG_PM=n
 
 CONFIG_MAIN_STACK_SIZE=10240

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,9 @@`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause`
`5`	`5`	`#`
	`6`	`+`
	`7`	`+# Enable external flash`
	`8`	`+CONFIG_SPI=y`
	`9`	`+CONFIG_SPI_NOR=y`
	`10`	`+CONFIG_SPI_NOR_SFDP_DEVICETREE=y`
	`11`	`+CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y`