[nrf noup] cmake: define pm.yml for settings subsystem

This pm.yml defines a partition 'settings_storage'.

Signed-off-by: Håkon Øye Amundsen <[email protected]>

Author: hakonfam

subsys/settings/CMakeLists.txt

@@ -4,3 +4,8 @@ add_subdirectory(src)
 zephyr_include_directories(
   include
   )
+
+if (CONFIG_SETTINGS_FCB OR CONFIG_SETTINGS_NVS)
+  # These settings backends require a partition in flash
+  add_partition_manager_config(pm.yml)
+endif()

subsys/settings/Kconfig

@@ -16,6 +16,14 @@ if SETTINGS
 module = SETTINGS
 module-str = settings
 source "subsys/logging/Kconfig.template.log_config"
+
+# This config must be compatible with
+# nrf/subsys/partition_manager/Kconfig.template.partition_size
+config PM_PARTITION_SIZE_SETTINGS_STORAGE
+	hex "Flash space reserved for settings storage partition"
+	default 0x6000
+	help
+	  Flash space set aside for the settings storage partition.
 endif
 
 config SETTINGS_RUNTIME

subsys/settings/pm.yml

@@ -0,0 +1,5 @@
+#include <autoconf.h>
+
+settings_storage:
+  placement: {after: [nffs_storage, mcuboot_storage, app]}
+  size: CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE

subsys/settings/src/settings_fcb.c

@@ -18,7 +18,7 @@
 #if USE_PARTITION_MANAGER
 
 #include <pm_config.h>
-#define FLASH_AREA_STORAGE_ID       PM_MCUBOOT_STORAGE_ID
+#define FLASH_AREA_STORAGE_ID       PM_SETTINGS_STORAGE_ID
 
 #else
 

subsys/settings/src/settings_init.c

@@ -18,7 +18,7 @@
 #if USE_PARTITION_MANAGER
 
 #include <pm_config.h>
-#define FLASH_AREA_STORAGE_ID       PM_MCUBOOT_STORAGE_ID
+#define FLASH_AREA_STORAGE_ID       PM_SETTINGS_STORAGE_ID
 
 #else
 
@@ -145,7 +145,7 @@ int settings_backend_init(void)
 	size_t nvs_sector_size, nvs_size = 0;
 	const struct flash_area *fa;
 
-	rc = flash_area_open(DT_FLASH_AREA_STORAGE_ID, &fa);
+	rc = flash_area_open(FLASH_AREA_STORAGE_ID, &fa);
 	if (rc) {
 		return rc;
 	}

tests/subsys/settings/fcb/src/settings_test_fcb.c

@@ -14,7 +14,7 @@
 #if USE_PARTITION_MANAGER
 
 #include <pm_config.h>
-#define FLASH_AREA_STORAGE_ID       PM_MCUBOOT_STORAGE_ID
+#define FLASH_AREA_STORAGE_ID       PM_SETTINGS_STORAGE_ID
 
 #else