Skip to content

Commit 259fc32

Browse files
committed
applications: Do not unset nRF5 bootloader
Remove override for (now promptless) Kconfig. Remove the override to ROM_START_OFFSET, which is already changes if the partition manager is enabled. Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent 3460c19 commit 259fc32

File tree

10 files changed

+0
-25
lines changed

10 files changed

+0
-25
lines changed

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
4040
CONFIG_UART_INTERRUPT_DRIVEN=n
4141
CONFIG_ASSERT=n
4242

43-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
44-
4543
# Use minimal C library instead of the Picolib
4644
CONFIG_MINIMAL_LIBC=y
4745

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
4040
CONFIG_UART_INTERRUPT_DRIVEN=n
4141
CONFIG_ASSERT=n
4242

43-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
44-
4543
# Use minimal C library instead of the Picolib
4644
CONFIG_MINIMAL_LIBC=y
4745

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
4040
CONFIG_UART_INTERRUPT_DRIVEN=n
4141
CONFIG_ASSERT=n
4242

43-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
44-
4543
# Use minimal C library instead of the Picolib
4644
CONFIG_MINIMAL_LIBC=y
4745

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
4040
CONFIG_UART_INTERRUPT_DRIVEN=n
4141
CONFIG_ASSERT=n
4242

43-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
44-
4543
# Use minimal C library instead of the Picolib
4644
CONFIG_MINIMAL_LIBC=y
4745

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
4040
CONFIG_UART_INTERRUPT_DRIVEN=n
4141
CONFIG_ASSERT=n
4242

43-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
44-
4543
# Use minimal C library instead of the Picolib
4644
CONFIG_MINIMAL_LIBC=y
4745

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
3636
################################################################################
3737
# Zephyr Configuration
3838

39-
CONFIG_ROM_START_OFFSET=0
40-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
41-
4239
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
4340
CONFIG_ISR_STACK_SIZE=1280
4441
CONFIG_MAIN_STACK_SIZE=840

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
4747
################################################################################
4848
# Zephyr Configuration
4949

50-
CONFIG_ROM_START_OFFSET=0
51-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
52-
5350
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
5451
CONFIG_ISR_STACK_SIZE=1280
5552
CONFIG_MAIN_STACK_SIZE=840

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
4646
################################################################################
4747
# Zephyr Configuration
4848

49-
CONFIG_ROM_START_OFFSET=0
50-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
51-
5249
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
5350
CONFIG_ISR_STACK_SIZE=1280
5451
CONFIG_MAIN_STACK_SIZE=840

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
3434
################################################################################
3535
# Zephyr Configuration
3636

37-
CONFIG_ROM_START_OFFSET=0
38-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
39-
4037
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
4138
CONFIG_ISR_STACK_SIZE=1280
4239
CONFIG_MAIN_STACK_SIZE=840

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y
4444
################################################################################
4545
# Zephyr Configuration
4646

47-
CONFIG_ROM_START_OFFSET=0
48-
CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
49-
5047
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
5148
CONFIG_ISR_STACK_SIZE=1280
5249
CONFIG_MAIN_STACK_SIZE=840

0 commit comments

Comments
 (0)