samples: bluetooth: adding missing dependency on SOC_FLASH_NRF_MRAM

rghaddab · rlubos · commit 83d744e2c493 · 2024-12-09T10:05:15.000+01:00
Some bluetooth samples are still selecting NVS for boards that have mram
technologies instead of ZMS.
Fix this by adding the missing CONFIG dependency

Signed-off-by: Riadh Ghaddab &lt;rghaddab@baylibre.com&gt;
diff --git a/samples/bluetooth/enocean/Kconfig b/samples/bluetooth/enocean/Kconfig
@@ -10,7 +10,7 @@ config SETTINGS
 	default y
 
 config ZMS
-	default y if SOC_FLASH_NRF_RRAM
+	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 config NVS
-	default y if !SOC_FLASH_NRF_RRAM
+	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
diff --git a/samples/bluetooth/fast_pair/locator_tag/Kconfig b/samples/bluetooth/fast_pair/locator_tag/Kconfig
@@ -27,10 +27,10 @@ config SETTINGS
 	default y
 
 config ZMS
-	default y if SOC_FLASH_NRF_RRAM
+	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 config NVS
-	default y if !SOC_FLASH_NRF_RRAM
+	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 endmenu
 
diff --git a/samples/bluetooth/peripheral_ams_client/Kconfig b/samples/bluetooth/peripheral_ams_client/Kconfig
@@ -10,7 +10,7 @@ config SETTINGS
 	default y
 
 config ZMS
-	default y if SOC_FLASH_NRF_RRAM
+	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 config NVS
-	default y if !SOC_FLASH_NRF_RRAM
+	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
diff --git a/samples/bluetooth/peripheral_ancs_client/Kconfig b/samples/bluetooth/peripheral_ancs_client/Kconfig
@@ -10,7 +10,7 @@ config SETTINGS
 	default y
 
 config ZMS
-	default y if SOC_FLASH_NRF_RRAM
+	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 config NVS
-	default y if !SOC_FLASH_NRF_RRAM
+	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
diff --git a/samples/bluetooth/peripheral_mds/Kconfig b/samples/bluetooth/peripheral_mds/Kconfig
@@ -11,5 +11,6 @@ config SETTINGS
 
 config ZMS
 	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
+
 config NVS
 	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
diff --git a/samples/bluetooth/peripheral_uart/Kconfig b/samples/bluetooth/peripheral_uart/Kconfig
@@ -37,7 +37,7 @@ config SETTINGS
 	default y
 
 config ZMS
-	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
+	default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
 
 config NVS
 	default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
