applications: nrf_desktop: Configuration cleanup

Remove unnecessary "# Flash" comment and use debug/release instead of ZDebug/ZRelease. Jira: NCSDK-26944 Signed-off-by: Marek Pieta <[email protected]>
nrfconnect · Jul 15, 2024 · 5a37179 · 5a37179
1 parent d768a38
commit 5a37179
Show file tree

Hide file tree

Showing 31 changed files with 28 additions and 45 deletions.
diff --git a/...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

diff --git a/...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 

diff --git a/...ations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf b/...ations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf
@@ -15,7 +15,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 
 # Required by QSPI

diff --git a/...cations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/...cations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Dongle version
+# debug: Dongle version
 #
-# This ZDebug build type configuration acts as a dongle.
+# This debug build type configuration acts as a dongle.
 #
 # Application Configuration
 

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Fast Pair version
+# debug: Fast Pair version
 #
-# This ZDebug build type configuration enables Fast Pair support.
+# This debug build type configuration enables Fast Pair support.
 # The build type configuration supports both configuration channel and MCUmgr DFU transports.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Keyboard version
+# debug: Keyboard version
 #
-# This ZDebug build type configuration acts as a keyboard.
+# This debug build type configuration acts as a keyboard.
 #
 # Application Configuration
 

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: MCUBootQSPI version
+# debug: MCUBootQSPI version
 #
-# This ZDebug build type configuration uses MCUboot with the secondary slot in the external QSPI FLASH.
+# This debug build type configuration uses MCUboot with the secondary slot in the external QSPI FLASH.
 #
 # Application Configuration
 

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: MCUBootSMP version
+# debug: MCUBootSMP version
 #
-# This ZDebug build type configuration enables MCUmgr with DFU support, with the image management
+# This debug build type configuration enables MCUmgr with DFU support, with the image management
 # commands enabled for this purpose.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Triple Bluetooth® LE connection version
+# debug: Triple Bluetooth® LE connection version
 #
-# This ZDebug build type configuration allows up to three simultaneous Bluetooth® LE connections.
+# This debug build type configuration allows up to three simultaneous Bluetooth® LE connections.
 #
 # Application Configuration
 

diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Quad LLPM connection version
+# debug: Quad LLPM connection version
 #
-# This ZDebug build type configuration allows up to four simultaneous Bluetooth® LE connections.
+# This debug build type configuration allows up to four simultaneous Bluetooth® LE connections.
 # This configuration enables the Low Latency Packet Mode.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZRelease: Quad LLPM connection version
+# release: Quad LLPM connection version
 #
-# This ZRelease build type configuration allows up to four simultaneous Bluetooth® LE connections.
+# This release build type configuration allows up to four simultaneous Bluetooth® LE connections.
 # This configuration enables the Low Latency Packet Mode.
 #
 # Application Configuration

diff --git a/...tions/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf b/...tions/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 

diff --git a/...ons/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/...ons/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf
@@ -14,7 +14,6 @@ CONFIG_MAIN_STACK_SIZE=10240
 
 CONFIG_BOOT_BOOTSTRAP=n
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 

diff --git a/...f_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf b/...f_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 

diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Fast Pair version
+# debug: Fast Pair version
 #
-# This ZDebug build type configuration enables Fast Pair support.
+# This debug build type configuration enables Fast Pair support.
 # The build type configuration supports both configuration channel and MCUmgr DFU transports.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: MCUBootSMP version
+# debug: MCUBootSMP version
 #
-# This ZDebug build type configuration enables MCUmgr with DFU support, with the image management commands enabled for this purpose.
+# This debug build type configuration enables MCUmgr with DFU support, with the image management commands enabled for this purpose.
 # The DFU over config channel is disabled.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZRelease: Fast Pair version
+# release: Fast Pair version
 #
-# This ZRelease build type configuration enables Fast Pair support.
+# This release build type configuration enables Fast Pair support.
 # The build type configuration supports both configuration channel and MCUmgr DFU transports.
 #
 # Application Configuration

diff --git a/...ons/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf b/...ons/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 

diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZRelease: Fast Pair version
+# release: Fast Pair version
 #
-# This ZRelease build type configuration enables Fast Pair support.
+# This release build type configuration enables Fast Pair support.
 # The build type configuration supports both configuration channel and MCUmgr DFU transports.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 
 # Reduce memory consumption

diff --git a/...s/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_fast_pair.conf b/...s/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_fast_pair.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 
 # Reduce memory consumption

diff --git a/...ns/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf b/...ns/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 
 # Reduce memory consumption

diff --git a/...ons/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf b/...ons/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
 
 CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
 
-# Flash
 CONFIG_FLASH=y
 
 # Reduce memory consumption

diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_fast_pair.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Fast Pair version
+# debug: Fast Pair version
 #
-# This ZDebug build type configuration enables Fast Pair support.
+# This debug build type configuration enables Fast Pair support.
 # The build type configuration supports both configuration channel and MCUmgr DFU transports.
 #
 # Application Configuration

diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 ################################################################################
-# ZDebug: Keyboard version
+# debug: Keyboard version
 #
-# This ZDebug build type configuration acts as a keyboard.
+# This debug build type configuration acts as a keyboard.
 #
 # Application Configuration
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n @@
     CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
-    # Flash
     CONFIG_FLASH=y
     CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
@@ Expand Down @@