app: Fix overlay-pgps.overlay and overlay-memfault.overlay

Additional partition needs to be inside storage_partition so that
TF-M sets it non-secure.

Signed-off-by: Markus Lassila <markus.lassila@nordicsemi.no>

Author: MarkusLassila

app/overlay-memfault.overlay

@@ -9,11 +9,13 @@
 / {
 	chosen {
 		nordic,memfault-coredump-partition = &memfault_coredump_partition;
+		zephyr,settings_partition = &settings_storage_partition;
 	};
 };
 
 /delete-node/ &slot0_partition;
 /delete-node/ &slot1_partition;
+/delete-node/ &storage_partition;
 
 &flash0 {
 	partitions {
@@ -63,13 +65,25 @@
 			};
 		};
 
-		memfault_coredump_partition: partition@f9000 {
+		storage_partition: partition@f9000 {
 			compatible = "zephyr,mapped-partition";
-			label = "memfault_coredump_partition";
-			reg = <0xf9000 0x4000>;
-			ranges = <0x0 0xf9000 0x4000>;
+			label = "storage";
+			reg = <0xf9000 0x7000>;
+			ranges = <0x0 0xf9000 0x7000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
+
+			memfault_coredump_partition: partition@0 {
+				compatible = "zephyr,mapped-partition";
+				label = "memfault_coredump_partition";
+				reg = <0x0 0x4000>;
+			};
+
+			settings_storage_partition: partition@4000 {
+				compatible = "zephyr,mapped-partition";
+				label = "settings-storage";
+				reg = <0x4000 0x3000>;
+			};
 		};
 	};
 };

app/overlay-pgps.overlay

@@ -9,11 +9,13 @@
 / {
 	chosen {
 		nordic,pgps_partition = &pgps_partition;
+		zephyr,settings_partition = &settings_storage_partition;
 	};
 };
 
 /delete-node/ &slot0_partition;
 /delete-node/ &slot1_partition;
+/delete-node/ &storage_partition;
 
 &flash0 {
 	partitions {
@@ -63,13 +65,25 @@
 			};
 		};
 
-		pgps_partition: partition@e9000 {
+		storage_partition: partition@e9000 {
 			compatible = "zephyr,mapped-partition";
-			label = "pgps";
-			reg = <0xe9000 0x14000>;
-			ranges = <0x0 0xe9000 0x14000>;
+			label = "storage";
+			reg = <0x000e9000 0x17000>;
+			ranges = <0x0 0x000e9000 0x17000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
+
+			pgps_partition: partition@0 {
+				compatible = "zephyr,mapped-partition";
+				label = "pgps";
+				reg = <0x00000000 0x14000>;
+			};
+
+			settings_storage_partition: partition@14000 {
+				compatible = "zephyr,mapped-partition";
+				label = "settings-storage";
+				reg = <0x000014000 0x3000>;
+			};
 		};
 	};
 };