applications: nrf_desktop: Cleanup nRF54H20 DK configurations

Change cleans up nRF54H20 DK configurations to improve configuration
consistency.

Jira: NCSDK-31539

Signed-off-by: Marek Pieta <[email protected]>

Author: MarekPieta

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf

@@ -16,6 +16,9 @@ CONFIG_DESKTOP_PERIPHERAL_TYPE_MOUSE=y
 CONFIG_DESKTOP_DEVICE_PID=0x52DE
 CONFIG_DESKTOP_HID_BOOT_INTERFACE_MOUSE=y
 
+# Application supports 2 HID subscribers: HID over GATT (BLE) and a single USB HID instance
+CONFIG_DESKTOP_HID_STATE_SUBSCRIBER_COUNT=2
+
 CONFIG_DESKTOP_MOTION_BUTTONS_ENABLE=y
 CONFIG_DESKTOP_MOTION_BUTTONS_UP_KEY_ID=0
 CONFIG_DESKTOP_MOTION_BUTTONS_DOWN_KEY_ID=3
@@ -30,6 +33,11 @@ CONFIG_CAF_CLICK_DETECTOR=y
 
 CONFIG_CAF_LEDS=y
 
+CONFIG_DESKTOP_USB_ENABLE=y
+# Enable the only USB stack that supports USBHS
+CONFIG_DESKTOP_USB_STACK_NEXT=y
+
+CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y
 CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n
 
 # The LLPM must be explicitly enabled, as the Bluetooth Controller
@@ -43,19 +51,11 @@ CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0000
 CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y
 
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
-
 CONFIG_DESKTOP_BLE_LOW_LATENCY_LOCK=y
 
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
-# Application supports 2 HID subscribers: HID over GATT (BLE) and a single USB HID instance
-CONFIG_DESKTOP_HID_STATE_SUBSCRIBER_COUNT=2
-
-CONFIG_DESKTOP_USB_ENABLE=y
-# Enable the only USB stack that supports USBHS
-CONFIG_DESKTOP_USB_STACK_NEXT=y
-
 ################################################################################
 # Zephyr Configuration
 
@@ -65,6 +65,7 @@ CONFIG_MAIN_STACK_SIZE=2816
 CONFIG_BT_RX_STACK_SIZE=2048
 CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
 CONFIG_BT_HCI_TX_STACK_SIZE=1536
+CONFIG_IDLE_STACK_SIZE=512
 
 CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
@@ -73,18 +74,17 @@ CONFIG_NUM_COOP_PRIORITIES=10
 CONFIG_NUM_PREEMPT_PRIORITIES=11
 
 CONFIG_HEAP_MEM_POOL_SIZE=2560
-CONFIG_IDLE_STACK_SIZE=512
 
 CONFIG_HW_STACK_PROTECTION=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 
+CONFIG_GPIO=y
+
 # Optimize for size to reduce memory footprint.
 CONFIG_SIZE_OPTIMIZATIONS=y
 
 CONFIG_REBOOT=y
 
-CONFIG_GPIO=y
-
 CONFIG_LED=y
 # PWM not supported on this target, using GPIO instead.
 CONFIG_LED_GPIO=y
@@ -95,28 +95,7 @@ CONFIG_BT_ID_MAX=3
 CONFIG_BT_ATT_TX_COUNT=4
 CONFIG_BT_CONN_TX_MAX=4
 
-################################################################################
-# Debug logs configuration
-
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-
-# UART logging is one of two suggested ways of reading logs on nRF54H20DK.
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-CONFIG_LOG=y
-CONFIG_LOG_BACKEND_UART=y
-CONFIG_LOG_BACKEND_SHOW_COLOR=n
-CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
-CONFIG_LOG_MODE_DEFERRED=y
-CONFIG_LOG_PRINTK=y
-CONFIG_LOG_BUFFER_SIZE=4096
-CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
-
 # Enable MCUmgr Bluetooth transport
-CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y
 CONFIG_MCUMGR_TRANSPORT_BT=y
 CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT=y
 
@@ -137,12 +116,33 @@ CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4096
 CONFIG_MCUMGR_GRP_OS=y
 CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
 
+# Configure Zephyr system power management
+CONFIG_PM=y
+CONFIG_PM_S2RAM=y
+CONFIG_PM_S2RAM_CUSTOM_MARKING=y
+
+################################################################################
+# Debug logs configuration
+
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+
+# UART logging is one of two suggested ways of reading logs on nRF54H20DK.
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
+CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
+CONFIG_LOG_MODE_DEFERRED=y
+CONFIG_LOG_PRINTK=y
+CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
+
 ################################################################################
 # DFU configuration
 
 CONFIG_SUIT=y
 CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_MINIMAL=y
-
-CONFIG_PM=y
-CONFIG_PM_S2RAM=y
-CONFIG_PM_S2RAM_CUSTOM_MARKING=y

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf

@@ -11,6 +11,9 @@ CONFIG_DESKTOP_PERIPHERAL_TYPE_MOUSE=y
 CONFIG_DESKTOP_DEVICE_PID=0x52DE
 CONFIG_DESKTOP_HID_BOOT_INTERFACE_MOUSE=y
 
+# Application supports 2 HID subscribers: HID over GATT (BLE) and a single USB HID instance
+CONFIG_DESKTOP_HID_STATE_SUBSCRIBER_COUNT=2
+
 CONFIG_DESKTOP_MOTION_BUTTONS_ENABLE=y
 CONFIG_DESKTOP_MOTION_BUTTONS_UP_KEY_ID=0
 CONFIG_DESKTOP_MOTION_BUTTONS_DOWN_KEY_ID=3
@@ -25,6 +28,12 @@ CONFIG_CAF_CLICK_DETECTOR=y
 
 CONFIG_CAF_LEDS=y
 
+CONFIG_DESKTOP_USB_ENABLE=y
+# Enable the only USB stack that supports USBHS
+CONFIG_DESKTOP_USB_STACK_NEXT=y
+
+CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y
+
 # The LLPM must be explicitly enabled, as the Bluetooth Controller
 # is not part of the main application.
 CONFIG_CAF_BLE_USE_LLPM=y
@@ -34,7 +43,6 @@ CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0000
 CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y
 
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
-
 CONFIG_DESKTOP_BLE_LOW_LATENCY_LOCK=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
@@ -43,13 +51,6 @@ CONFIG_DESKTOP_FAILSAFE_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
-# Application supports 2 HID subscribers: HID over GATT (BLE) and a single USB HID instance
-CONFIG_DESKTOP_HID_STATE_SUBSCRIBER_COUNT=2
-
-CONFIG_DESKTOP_USB_ENABLE=y
-# Enable the only USB stack that supports USBHS
-CONFIG_DESKTOP_USB_STACK_NEXT=y
-
 ################################################################################
 # Zephyr Configuration
 
@@ -59,6 +60,7 @@ CONFIG_MAIN_STACK_SIZE=2816
 CONFIG_BT_RX_STACK_SIZE=2048
 CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
 CONFIG_BT_HCI_TX_STACK_SIZE=1536
+CONFIG_IDLE_STACK_SIZE=512
 
 CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
@@ -67,17 +69,16 @@ CONFIG_NUM_COOP_PRIORITIES=10
 CONFIG_NUM_PREEMPT_PRIORITIES=11
 
 CONFIG_HEAP_MEM_POOL_SIZE=2560
-CONFIG_IDLE_STACK_SIZE=512
 
 CONFIG_HW_STACK_PROTECTION=n
 CONFIG_RESET_ON_FATAL_ERROR=n
 
+CONFIG_GPIO=y
+
 CONFIG_SPEED_OPTIMIZATIONS=y
 
 CONFIG_REBOOT=y
 
-CONFIG_GPIO=y
-
 CONFIG_LED=y
 # PWM not supported on this target, using GPIO instead.
 CONFIG_LED_GPIO=y
@@ -88,15 +89,7 @@ CONFIG_BT_ID_MAX=3
 CONFIG_BT_ATT_TX_COUNT=4
 CONFIG_BT_CONN_TX_MAX=4
 
-################################################################################
-# Disable unused features
-
-CONFIG_SERIAL=n
-CONFIG_CONSOLE=n
-CONFIG_UART_CONSOLE=n
-
 # Enable MCUmgr Bluetooth transport
-CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y
 CONFIG_MCUMGR_TRANSPORT_BT=y
 CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT=y
 
@@ -117,12 +110,20 @@ CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4096
 CONFIG_MCUMGR_GRP_OS=y
 CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
 
+# Configure Zephyr system power management
+CONFIG_PM=y
+CONFIG_PM_S2RAM=y
+CONFIG_PM_S2RAM_CUSTOM_MARKING=y
+
+################################################################################
+# Disable unused features
+
+CONFIG_SERIAL=n
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+
 ################################################################################
 # DFU configuration
 
 CONFIG_SUIT=y
 CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_MINIMAL=y
-
-CONFIG_PM=y
-CONFIG_PM_S2RAM=y
-CONFIG_PM_S2RAM_CUSTOM_MARKING=y

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/prj.conf

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_LOG=n
 CONFIG_BOOT_BANNER=n
 
 CONFIG_IPC_SERVICE=y
@@ -15,15 +14,16 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_MAIN_STACK_SIZE=512
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
 
+CONFIG_IPC_RADIO_BT=y
+CONFIG_IPC_RADIO_BT_HCI_IPC=y
+
 CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
 CONFIG_BT_LL_SOFTDEVICE=y
-
 CONFIG_BT_CTLR_SDC_LLPM=y
-
 CONFIG_BT_CTLR_TX_PWR_0=y
 
 # CAF BLE state uses HCI command to set the connection TX power right after connection is established.
@@ -33,9 +33,12 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
 CONFIG_BT_CTLR_FILTER_ACCEPT_LIST=y
 CONFIG_BT_CTLR_PRIVACY=y
 
-CONFIG_ASSERT=y
+# Allow for large Bluetooth data packets.
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 
-# Disable reset on fatal error for better debbuging experience.
+# Disable reset on fatal error for better debugging experience.
 CONFIG_RESET_ON_FATAL_ERROR=n
 
 CONFIG_SPEED_OPTIMIZATIONS=y
@@ -44,8 +47,13 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
 
+# Enable Zephyr system power management
+CONFIG_PM=y
+
 ################################################################################
-# Debug logs
+# Debug functionalities
+
+CONFIG_ASSERT=y
 
 CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
@@ -58,13 +66,3 @@ CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
 CONFIG_LOG_PRINTK=y
 
 CONFIG_THREAD_NAME=y
-
-CONFIG_IPC_RADIO_BT=y
-CONFIG_IPC_RADIO_BT_HCI_IPC=y
-
-# Allow for large Bluetooth data packets.
-CONFIG_BT_BUF_ACL_RX_SIZE=502
-CONFIG_BT_BUF_ACL_TX_SIZE=251
-CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
-
-CONFIG_PM=y

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/prj_release.conf

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_LOG=n
 CONFIG_BOOT_BANNER=n
 
 CONFIG_IPC_SERVICE=y
@@ -15,15 +14,16 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_MAIN_STACK_SIZE=512
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
 
+CONFIG_IPC_RADIO_BT=y
+CONFIG_IPC_RADIO_BT_HCI_IPC=y
+
 CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
 CONFIG_BT_LL_SOFTDEVICE=y
-
 CONFIG_BT_CTLR_SDC_LLPM=y
-
 CONFIG_BT_CTLR_TX_PWR_0=y
 
 # CAF BLE state uses HCI command to set the connection TX power right after connection is established.
@@ -33,6 +33,12 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
 CONFIG_BT_CTLR_FILTER_ACCEPT_LIST=y
 CONFIG_BT_CTLR_PRIVACY=y
 
+# Allow for large Bluetooth data packets.
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
+# Improve firmware reliability.
 CONFIG_RESET_ON_FATAL_ERROR=y
 
 CONFIG_SPEED_OPTIMIZATIONS=y
@@ -41,19 +47,12 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
 
+# Enable Zephyr system power management
+CONFIG_PM=y
+
 ################################################################################
 # Disable unused features
 
 CONFIG_SERIAL=n
 CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
-
-CONFIG_IPC_RADIO_BT=y
-CONFIG_IPC_RADIO_BT_HCI_IPC=y
-
-# Allow for large Bluetooth data packets.
-CONFIG_BT_BUF_ACL_RX_SIZE=502
-CONFIG_BT_BUF_ACL_TX_SIZE=251
-CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
-
-CONFIG_PM=y