applications: nrf_desktop: Use app-specific option to enable BLE bond

MarekPieta · rlubos · commit db2a3fc0b3d7 · 2022-01-21T11:22:06.000+01:00
Change switches to using app-specific Kconfig option to enable
Bluetooth LE bond module.

Jira: NCSDK-13154

Signed-off-by: Marek Pieta &lt;Marek.Pieta@nordicsemi.no&gt;
Signed-off-by: Divya Pillai &lt;divya.pillai@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf
@@ -41,7 +41,7 @@ CONFIG_CAF_BUTTONS_PM_KEEP_ALIVE=n
 CONFIG_CAF_CLICK_DETECTOR=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf
@@ -36,7 +36,7 @@ CONFIG_CAF_BUTTONS_PM_KEEP_ALIVE=n
 CONFIG_CAF_CLICK_DETECTOR=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
@@ -26,7 +26,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf
@@ -21,7 +21,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release_mcuboot.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release_mcuboot.conf
@@ -21,7 +21,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf
@@ -26,7 +26,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf
@@ -21,7 +21,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_shell.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_shell.conf
@@ -26,7 +26,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf
@@ -26,7 +26,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_mcuboot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_mcuboot.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf
@@ -22,7 +22,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release_mcuboot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release_mcuboot.conf
@@ -22,7 +22,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_shell.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_shell.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf
@@ -36,7 +36,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_b0.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_b0.conf
@@ -36,7 +36,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf
@@ -30,7 +30,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf
@@ -38,7 +38,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf
@@ -40,7 +40,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf
@@ -40,7 +40,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_SMP=y
 CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf
@@ -31,7 +31,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release_b0.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release_b0.conf
@@ -31,7 +31,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_shell.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_shell.conf
@@ -36,7 +36,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf
@@ -32,7 +32,7 @@ CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
 CONFIG_CAF_BLE_USE_LLPM=n
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf
@@ -32,7 +32,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_b0.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_b0.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf
@@ -22,7 +22,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_b0.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_b0.conf
@@ -22,7 +22,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_shell.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_shell.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf
@@ -45,7 +45,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_b0.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_b0.conf
@@ -45,7 +45,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf
@@ -50,7 +50,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_SMP=y
 CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf
@@ -39,7 +39,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_b0.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_b0.conf
@@ -39,7 +39,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_shell.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_shell.conf
@@ -45,7 +45,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf
@@ -42,7 +42,7 @@ CONFIG_CAF_BUTTONS_PM_KEEP_ALIVE=n
 CONFIG_CAF_CLICK_DETECTOR=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf
@@ -36,7 +36,7 @@ CONFIG_CAF_BUTTONS_PM_KEEP_ALIVE=n
 CONFIG_CAF_CLICK_DETECTOR=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf
@@ -33,7 +33,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_b0.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_b0.conf
@@ -33,7 +33,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf
@@ -28,7 +28,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_b0.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_b0.conf
@@ -28,7 +28,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_shell.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_shell.conf
@@ -33,7 +33,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_BLE_ADV=y
 CONFIG_CAF_BLE_ADV_DIRECT_ADV=n
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf
@@ -27,7 +27,7 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_CAF_BLE_STATE=y
-CONFIG_CAF_BLE_BOND_SUPPORTED=y
+CONFIG_DESKTOP_BLE_BOND_ENABLE=y
 
 CONFIG_CAF_SETTINGS_LOADER=y
 
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_b0.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_b0.conf
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release_b0.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release_b0.conf
diff --git a/applications/nrf_desktop/doc/ble_bond.rst b/applications/nrf_desktop/doc/ble_bond.rst
diff --git a/applications/nrf_desktop/src/modules/CMakeLists.txt b/applications/nrf_desktop/src/modules/CMakeLists.txt
diff --git a/applications/nrf_desktop/src/modules/Kconfig.ble b/applications/nrf_desktop/src/modules/Kconfig.ble
diff --git a/doc/nrf/releases/release-notes-changelog.rst b/doc/nrf/releases/release-notes-changelog.rst
