Revert NO_SOFT_DEVICE change.

Will be more work, will work on it in it's own feature branch.

Author: nitz

Makefile

@@ -263,11 +263,7 @@ ifneq ($(USE_NFCT),yes)
   CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
 endif
 
-# Skip defining SOFTDEVICE_PRESENT if the device doesn't use a soft device.
-ifneq ($(NO_SOFT_DEVICE),yes)
-  CFLAGS += -DSOFTDEVICE_PRESENT
-endif
-
+CFLAGS += -DSOFTDEVICE_PRESENT
 CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096
 
 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS)"'

src/boards/nrf52840_m2/board.mk

@@ -1,3 +1,2 @@
 MCU_SUB_VARIANT = nrf52840
 USE_NFCT = yes
-NO_SOFT_DEVICE = yes