[nrf toup][nrfconnect] Enable ZMS in nrfconnect if RRAM is in use.

Disabled NVS and enabled ZMS fs backend for all devices that
uses RRAM.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

config/nrfconnect/chip-module/Kconfig

@@ -17,8 +17,12 @@
 rsource "../../zephyr/Kconfig"
 
 config CHIP
-	imply NVS_LOOKUP_CACHE
-	imply NVS_LOOKUP_CACHE_FOR_SETTINGS
+	imply NVS if !SOC_FLASH_NRF_RRAM
+	imply NVS_LOOKUP_CACHE if !SOC_FLASH_NRF_RRAM
+	imply NVS_LOOKUP_CACHE_FOR_SETTINGS if !SOC_FLASH_NRF_RRAM
+	imply ZMS if SOC_FLASH_NRF_RRAM
+	imply ZMS_LOOKUP_CACHE if SOC_FLASH_NRF_RRAM
+	imply ZMS_LOOKUP_CACHE_FOR_SETTINGS if SOC_FLASH_NRF_RRAM
 
 if CHIP
 
@@ -325,8 +329,16 @@ endif # CHIP_FACTORY_DATA_BUILD
 config CHIP_FACTORY_RESET_ERASE_NVS
 	bool
 	default y
+	depends on NVS
 	depends on !CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY
 
+config CHIP_FACTORY_RESET_ERASE_ZMS
+	bool
+	default y
+	depends on ZMS
+	depends on !CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY
+
+
 config CHIP_LOG_SIZE_OPTIMIZATION
 	bool "Disable some detailed logs to decrease flash usage"
 	help

config/nrfconnect/chip-module/Kconfig.defaults

@@ -65,7 +65,10 @@ config COMMON_LIBC_MALLOC_ARENA_SIZE
     default -1
 
 config NVS_LOOKUP_CACHE_SIZE
-    default 512
+    default 512 if NVS
+
+config ZMS_LOOKUP_CACHE_SIZE
+    default 512 if ZMS
 
 # ==============================================================================
 # Zephyr networking configuration

src/platform/Zephyr/ConfigurationManagerImpl.cpp

@@ -204,7 +204,7 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
 
     if (status == 0)
     {
-#ifdef(CONFIG_CHIP_FACTORY_RESET_ERASE_NVS)
+#ifdef CONFIG_CHIP_FACTORY_RESET_ERASE_NVS
         status = nvs_clear(static_cast<nvs_fs *>(storage));
 #elif CONFIG_CHIP_FACTORY_RESET_ERASE_ZMS
         status = zms_clear(static_cast<zms_fs *>(storage));