Skip to content

Commit 5a37179

Browse files
MarekPietarlubos
MarekPieta
authored and
rlubos
committed
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 <Marek.Pieta@nordicsemi.no>
1 parent d768a38 commit 5a37179

File tree

31 files changed

+28
-45
lines changed

31 files changed

+28
-45
lines changed

‎applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616

1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_BOOT_ERASE_PROGRESSIVELY=y
2221
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

‎applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616

1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_BOOT_ERASE_PROGRESSIVELY=y
2221
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

‎applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616

1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_BOOT_ERASE_PROGRESSIVELY=y
2221
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

‎applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616

1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_BOOT_ERASE_PROGRESSIVELY=y
2221
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

‎applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616

1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_BOOT_ERASE_PROGRESSIVELY=y
2221
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

‎applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616

1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_BOOT_ERASE_PROGRESSIVELY=y
2221
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
2423

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1515

1616
CONFIG_BOOT_BOOTSTRAP=n
1717

18-
# Flash
1918
CONFIG_FLASH=y
2019

2120
# Required by QSPI

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
1616
CONFIG_BOOT_MAX_IMG_SECTORS=256
1717
CONFIG_BOOT_BOOTSTRAP=n
1818

19-
# Flash
2019
CONFIG_FLASH=y
2120
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
2221

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Dongle version
7+
# debug: Dongle version
88
#
9-
# This ZDebug build type configuration acts as a dongle.
9+
# This debug build type configuration acts as a dongle.
1010
#
1111
# Application Configuration
1212

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Fast Pair version
7+
# debug: Fast Pair version
88
#
9-
# This ZDebug build type configuration enables Fast Pair support.
9+
# This debug build type configuration enables Fast Pair support.
1010
# The build type configuration supports both configuration channel and MCUmgr DFU transports.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Keyboard version
7+
# debug: Keyboard version
88
#
9-
# This ZDebug build type configuration acts as a keyboard.
9+
# This debug build type configuration acts as a keyboard.
1010
#
1111
# Application Configuration
1212

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: MCUBootQSPI version
7+
# debug: MCUBootQSPI version
88
#
9-
# This ZDebug build type configuration uses MCUboot with the secondary slot in the external QSPI FLASH.
9+
# This debug build type configuration uses MCUboot with the secondary slot in the external QSPI FLASH.
1010
#
1111
# Application Configuration
1212

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: MCUBootSMP version
7+
# debug: MCUBootSMP version
88
#
9-
# This ZDebug build type configuration enables MCUmgr with DFU support, with the image management
9+
# This debug build type configuration enables MCUmgr with DFU support, with the image management
1010
# commands enabled for this purpose.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Triple Bluetooth® LE connection version
7+
# debug: Triple Bluetooth® LE connection version
88
#
9-
# This ZDebug build type configuration allows up to three simultaneous Bluetooth® LE connections.
9+
# This debug build type configuration allows up to three simultaneous Bluetooth® LE connections.
1010
#
1111
# Application Configuration
1212

‎applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Quad LLPM connection version
7+
# debug: Quad LLPM connection version
88
#
9-
# This ZDebug build type configuration allows up to four simultaneous Bluetooth® LE connections.
9+
# This debug build type configuration allows up to four simultaneous Bluetooth® LE connections.
1010
# This configuration enables the Low Latency Packet Mode.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZRelease: Quad LLPM connection version
7+
# release: Quad LLPM connection version
88
#
9-
# This ZRelease build type configuration allows up to four simultaneous Bluetooth® LE connections.
9+
# This release build type configuration allows up to four simultaneous Bluetooth® LE connections.
1010
# This configuration enables the Low Latency Packet Mode.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
2423

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_MAIN_STACK_SIZE=10240
1414

1515
CONFIG_BOOT_BOOTSTRAP=n
1616

17-
# Flash
1817
CONFIG_FLASH=y
1918
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
2019

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
2423

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Fast Pair version
7+
# debug: Fast Pair version
88
#
9-
# This ZDebug build type configuration enables Fast Pair support.
9+
# This debug build type configuration enables Fast Pair support.
1010
# The build type configuration supports both configuration channel and MCUmgr DFU transports.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: MCUBootSMP version
7+
# debug: MCUBootSMP version
88
#
9-
# This ZDebug build type configuration enables MCUmgr with DFU support, with the image management commands enabled for this purpose.
9+
# This debug build type configuration enables MCUmgr with DFU support, with the image management commands enabled for this purpose.
1010
# The DFU over config channel is disabled.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZRelease: Fast Pair version
7+
# release: Fast Pair version
88
#
9-
# This ZRelease build type configuration enables Fast Pair support.
9+
# This release build type configuration enables Fast Pair support.
1010
# The build type configuration supports both configuration channel and MCUmgr DFU transports.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322
CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
2423

‎applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZRelease: Fast Pair version
7+
# release: Fast Pair version
88
#
9-
# This ZRelease build type configuration enables Fast Pair support.
9+
# This release build type configuration enables Fast Pair support.
1010
# The build type configuration supports both configuration channel and MCUmgr DFU transports.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322

2423
# Reduce memory consumption

‎applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_fast_pair.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322

2423
# Reduce memory consumption

‎applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322

2423
# Reduce memory consumption

‎applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818

1919
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
2020

21-
# Flash
2221
CONFIG_FLASH=y
2322

2423
# Reduce memory consumption

‎applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_fast_pair.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Fast Pair version
7+
# debug: Fast Pair version
88
#
9-
# This ZDebug build type configuration enables Fast Pair support.
9+
# This debug build type configuration enables Fast Pair support.
1010
# The build type configuration supports both configuration channel and MCUmgr DFU transports.
1111
#
1212
# Application Configuration

‎applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
################################################################################
7-
# ZDebug: Keyboard version
7+
# debug: Keyboard version
88
#
9-
# This ZDebug build type configuration acts as a keyboard.
9+
# This debug build type configuration acts as a keyboard.
1010
#
1111
# Application Configuration
1212

0 commit comments

Comments
 (0)