applications: nrf_desktop: Do not unset nRF5 bootloader

tomchy · MarekPieta · commit 93d73fe40877 · 2025-09-16T12:29:34.000+02:00
Remove override for (now promptless) Kconfig.
Remove the override to ROM_START_OFFSET, which is already changed if the
partition manager is enabled.

Signed-off-by: Tomasz Chyrowicz &lt;tomasz.chyrowicz@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst
@@ -93,6 +93,9 @@ nRF52840 USB Dongle (``nrf52840dongle/nrf52840``) and nRF52833 USB Dongle (``nrf
       * Bluetooth uses Nordic Semiconductor's SoftDevice link layer and is configured to act as a central.
         Input data comes from Bluetooth and is retransmitted to USB.
       * The configuration with the B0 bootloader is set as default for the ``nrf52840dongle/nrf52840`` board and with the MCUboot bootloader is set as default for the ``nrf52833dongle`` board.
+     * The nRF5 MBR partition (``nrf5_mbr``) added by the ``nrf52840dongle/nrf52840`` board is not used.
+       It is statically defined with address and size both set to zero to prevent Partition Manager from trying to place it dynamically.
+       The application did not switch to the ``bare`` board variant to keep backwards compatibility.
 
 nRF52820 USB Dongle (``nrf52820dongle``)
       * The application is configured to act as a dongle that forwards data from both mouse and keyboard.
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ASSERT=n
 
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ASSERT=n
 
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ASSERT=n
 
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ASSERT=n
 
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ASSERT=n
 
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml
@@ -38,3 +38,6 @@ s1_image:
 settings_storage:
   address: 0xfe000
   size: 0x2000
+nrf5_mbr:
+  address: 0x0
+  size: 0x0
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml
@@ -38,3 +38,6 @@ s1_image:
 settings_storage:
   address: 0xfe000
   size: 0x2000
+nrf5_mbr:
+  address: 0x0
+  size: 0x0
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml
@@ -38,3 +38,6 @@ s1_image:
 settings_storage:
   address: 0xfe000
   size: 0x2000
+nrf5_mbr:
+  address: 0x0
+  size: 0x0
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml
@@ -38,3 +38,6 @@ s1_image:
 settings_storage:
   address: 0xfe000
   size: 0x2000
+nrf5_mbr:
+  address: 0x0
+  size: 0x0
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml
@@ -38,3 +38,6 @@ s1_image:
 settings_storage:
   address: 0xfe000
   size: 0x2000
+nrf5_mbr:
+  address: 0x0
+  size: 0x0
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf
@@ -38,9 +38,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
 ################################################################################
 # Zephyr Configuration
 
-CONFIG_ROM_START_OFFSET=0
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
 CONFIG_ISR_STACK_SIZE=1280
 CONFIG_MAIN_STACK_SIZE=840
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf
@@ -49,9 +49,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
 ################################################################################
 # Zephyr Configuration
 
-CONFIG_ROM_START_OFFSET=0
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
 CONFIG_ISR_STACK_SIZE=1280
 CONFIG_MAIN_STACK_SIZE=840
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf
@@ -48,9 +48,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
 ################################################################################
 # Zephyr Configuration
 
-CONFIG_ROM_START_OFFSET=0
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
 CONFIG_ISR_STACK_SIZE=1280
 CONFIG_MAIN_STACK_SIZE=840
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf
@@ -36,9 +36,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
 ################################################################################
 # Zephyr Configuration
 
-CONFIG_ROM_START_OFFSET=0
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
 CONFIG_ISR_STACK_SIZE=1280
 CONFIG_MAIN_STACK_SIZE=840
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf
@@ -46,9 +46,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
 ################################################################################
 # Zephyr Configuration
 
-CONFIG_ROM_START_OFFSET=0
-CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
-
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
 CONFIG_ISR_STACK_SIZE=1280
 CONFIG_MAIN_STACK_SIZE=840
