diff --git a/boards/arm/frdm_k22f/board.cmake b/boards/arm/frdm_k22f/board.cmake
index 5904d15768b..debe44fba36 100644
--- a/boards/arm/frdm_k22f/board.cmake
+++ b/boards/arm/frdm_k22f/board.cmake
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW daplink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  set_ifndef(BOARD_DEBUG_RUNNER jlink)
-  set_ifndef(BOARD_FLASH_RUNNER jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  set_ifndef(BOARD_DEBUG_RUNNER pyocd)
-  set_ifndef(BOARD_FLASH_RUNNER pyocd)
-endif()
-
 board_runner_args(jlink "--device=MK22FN512xxx12")
 board_runner_args(pyocd "--target=k22f")
 
diff --git a/boards/arm/frdm_k22f/doc/index.rst b/boards/arm/frdm_k22f/doc/index.rst
index b90992b5a08..73f7b416161 100644
--- a/boards/arm/frdm_k22f/doc/index.rst
+++ b/boards/arm/frdm_k22f/doc/index.rst
@@ -199,8 +199,15 @@ the `Segger J-Link OpenSDA V2.1 Firmware`_. Note that Segger
 does provide an OpenSDA J-Link Board-Specific Firmware for this board, however
 it is not compatible with the DAPLink bootloader.
 
-Add the argument ``-DOPENSDA_FW=jlink`` when you invoke ``west build`` to
-override the default runner from pyOCD to J-Link:
+Add the arguments ``-DBOARD_FLASH_RUNNER=jlink`` and
+``-DBOARD_DEBUG_RUNNER=jlink`` when you invoke ``west build`` to override the
+default runner from pyOCD to J-Link:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_k22f
+   :gen-args: -DBOARD_FLASH_RUNNER=jlink -DBOARD_DEBUG_RUNNER=jlink
+   :goals: build
 
 Configuring a Console
 =====================
diff --git a/boards/arm/frdm_k64f/board.cmake b/boards/arm/frdm_k64f/board.cmake
index c4340c1481c..a7302350a26 100644
--- a/boards/arm/frdm_k64f/board.cmake
+++ b/boards/arm/frdm_k64f/board.cmake
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW daplink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(jlink "--device=MK64FN1M0xxx12")
 board_runner_args(pyocd "--target=k64f")
 
diff --git a/boards/arm/frdm_k64f/doc/index.rst b/boards/arm/frdm_k64f/doc/index.rst
index 2dedef32a8a..1145a0e1cdf 100644
--- a/boards/arm/frdm_k64f/doc/index.rst
+++ b/boards/arm/frdm_k64f/doc/index.rst
@@ -239,13 +239,14 @@ the `OpenSDA J-Link Generic Firmware for V3.2 Bootloader`_. Note that Segger
 does provide an OpenSDA J-Link Board-Specific Firmware for this board, however
 it is not compatible with the DAPLink bootloader.
 
-Add the argument ``-DOPENSDA_FW=jlink`` when you invoke ``west build`` to
-override the default runner from pyOCD to J-Link:
+Add the arguments ``-DBOARD_FLASH_RUNNER=jlink`` and
+``-DBOARD_DEBUG_RUNNER=jlink`` when you invoke ``west build`` to override the
+default runner from pyOCD to J-Link:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :board: frdm_k64f
-   :gen-args: -DOPENSDA_FW=jlink
+   :gen-args: -DBOARD_FLASH_RUNNER=jlink -DBOARD_DEBUG_RUNNER=jlink
    :goals: build
 
 Configuring a Console
diff --git a/boards/arm/frdm_k82f/board.cmake b/boards/arm/frdm_k82f/board.cmake
index 17ff7dc35e6..c420975108d 100644
--- a/boards/arm/frdm_k82f/board.cmake
+++ b/boards/arm/frdm_k82f/board.cmake
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW daplink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(jlink "--device=MK82FN256xxx15")
 board_runner_args(pyocd "--target=k82f25615")
 
diff --git a/boards/arm/frdm_k82f/doc/index.rst b/boards/arm/frdm_k82f/doc/index.rst
index 616405591be..079d8590650 100644
--- a/boards/arm/frdm_k82f/doc/index.rst
+++ b/boards/arm/frdm_k82f/doc/index.rst
@@ -156,14 +156,15 @@ path.
 Follow the instructions in :ref:`opensda-jlink-onboard-debug-probe` to program
 the `OpenSDA J-Link Firmware for FRDM-K82F`_.
 
-Add the argument ``-DOPENSDA_FW=jlink`` when you invoke ``west build`` or
-``cmake`` to override the default runner from pyOCD to J-Link:
+Add the arguments ``-DBOARD_FLASH_RUNNER=jlink`` and
+``-DBOARD_DEBUG_RUNNER=jlink`` when you invoke ``west build`` to override the
+default runner from pyOCD to J-Link:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :tool: all
    :board: frdm_k82f
-   :gen-args: -DOPENSDA_FW=jlink
+   :gen-args: -DBOARD_FLASH_RUNNER=jlink -DBOARD_DEBUG_RUNNER=jlink
    :goals: build
 
 Configuring a Console
diff --git a/boards/arm/frdm_kl25z/board.cmake b/boards/arm/frdm_kl25z/board.cmake
index 9c397b36c51..7f7a37db23f 100644
--- a/boards/arm/frdm_kl25z/board.cmake
+++ b/boards/arm/frdm_kl25z/board.cmake
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW daplink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(jlink "--device=MKL25Z128xxx4")
 board_runner_args(pyocd "--target=kl25z")
 
diff --git a/boards/arm/frdm_kl25z/doc/index.rst b/boards/arm/frdm_kl25z/doc/index.rst
index 775c1ed1d0c..dd845bf245d 100644
--- a/boards/arm/frdm_kl25z/doc/index.rst
+++ b/boards/arm/frdm_kl25z/doc/index.rst
@@ -149,13 +149,14 @@ path.
 Follow the instructions in :ref:`opensda-jlink-onboard-debug-probe` to program
 the `OpenSDA J-Link FRDM-KL25Z Firmware`_.
 
-Add the argument ``-DOPENSDA_FW=jlink`` when you invoke ``west build`` to
-override the default runner from pyOCD to J-Link:
+Add the arguments ``-DBOARD_FLASH_RUNNER=jlink`` and
+``-DBOARD_DEBUG_RUNNER=jlink`` when you invoke ``west build`` to override the
+default runner from pyOCD to J-Link:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :board: frdm_kl25z
-   :gen-args: -DOPENSDA_FW=jlink
+   :gen-args: -DBOARD_FLASH_RUNNER=jlink -DBOARD_DEBUG_RUNNER=jlink
    :goals: build
 
 Configuring a Console
diff --git a/boards/arm/frdm_kw41z/board.cmake b/boards/arm/frdm_kw41z/board.cmake
index f6ed395c822..c0f79373c8c 100644
--- a/boards/arm/frdm_kw41z/board.cmake
+++ b/boards/arm/frdm_kw41z/board.cmake
@@ -1,17 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW daplink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(jlink "--device=MKW41Z512xxx4")
 board_runner_args(pyocd "--target=kw41z4")
 
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/arm/frdm_kw41z/doc/index.rst b/boards/arm/frdm_kw41z/doc/index.rst
index 6e9459231d6..acf96cea398 100644
--- a/boards/arm/frdm_kw41z/doc/index.rst
+++ b/boards/arm/frdm_kw41z/doc/index.rst
@@ -170,13 +170,14 @@ path.
 Follow the instructions in :ref:`opensda-jlink-onboard-debug-probe` to program
 the `OpenSDA J-Link FRDM-KW41Z Firmware`_.
 
-Add the argument ``-DOPENSDA_FW=jlink`` when you invoke ``west build`` to
-override the default runner from pyOCD to J-Link:
+Add the arguments ``-DBOARD_FLASH_RUNNER=jlink`` and
+``-DBOARD_DEBUG_RUNNER=jlink`` when you invoke ``west build`` to override the
+default runner from pyOCD to J-Link:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :board: frdm_kw41z
-   :gen-args: -DOPENSDA_FW=jlink
+   :gen-args: -DBOARD_FLASH_RUNNER=jlink -DBOARD_DEBUG_RUNNER=jlink
    :goals: build
 
 Configuring a Console
diff --git a/boards/arm/hexiwear_k64/board.cmake b/boards/arm/hexiwear_k64/board.cmake
index ba5ff43c340..487cfeb0d0d 100644
--- a/boards/arm/hexiwear_k64/board.cmake
+++ b/boards/arm/hexiwear_k64/board.cmake
@@ -1,17 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(pyocd "--target=k64f")
 board_runner_args(jlink "--device=MK64FN1M0xxx12")
 
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/arm/hexiwear_k64/doc/index.rst b/boards/arm/hexiwear_k64/doc/index.rst
index a0030e2a742..1e80b10b1b3 100644
--- a/boards/arm/hexiwear_k64/doc/index.rst
+++ b/boards/arm/hexiwear_k64/doc/index.rst
@@ -189,13 +189,14 @@ program the `OpenSDA DAPLink Hexiwear Firmware`_. Check that switches SW1 and
 SW2 are **on**, and SW3 and SW4 are **off**  to ensure K64F SWD signals are
 connected to the OpenSDA microcontroller.
 
-Add the argument ``-DOPENSDA_FW=daplink`` when you invoke ``west build`` to
-override the default runner from J-Link to pyOCD:
+Add the arguments ``-DBOARD_FLASH_RUNNER=pyocd`` and
+``-DBOARD_DEBUG_RUNNER=pyocd`` when you invoke ``west build`` to override the
+default runner from J-Link to pyOCD:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :board: hexiwear_k64
-   :gen-args: -DOPENSDA_FW=daplink
+   :gen-args: -DBOARD_FLASH_RUNNER=pyocd -DBOARD_DEBUG_RUNNER=pyocd
    :goals: build
 
 Configuring a Console
diff --git a/boards/arm/hexiwear_kw40z/board.cmake b/boards/arm/hexiwear_kw40z/board.cmake
index cb76035c506..a93baa325e6 100644
--- a/boards/arm/hexiwear_kw40z/board.cmake
+++ b/boards/arm/hexiwear_kw40z/board.cmake
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(jlink "--device=MKW40Z160xxx4")
 board_runner_args(pyocd "--target=kw40z4")
 
diff --git a/boards/arm/lpcxpresso54114/board.cmake b/boards/arm/lpcxpresso54114/board.cmake
index dcedd71f11a..6c59415aee9 100644
--- a/boards/arm/lpcxpresso54114/board.cmake
+++ b/boards/arm/lpcxpresso54114/board.cmake
@@ -4,13 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set_ifndef(LPCLINK_FW jlink)
-
-if(LPCLINK_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-endif()
-
 if(CONFIG_BOARD_LPCXPRESSO54114_M4)
 board_runner_args(jlink "--device=LPC54114J256_M4" "--reset-after-load")
 elseif(CONFIG_BOARD_LPCXPRESSO54114_M0)
diff --git a/boards/arm/lpcxpresso55s69/board.cmake b/boards/arm/lpcxpresso55s69/board.cmake
index 9b480330e1e..791f33a031c 100644
--- a/boards/arm/lpcxpresso55s69/board.cmake
+++ b/boards/arm/lpcxpresso55s69/board.cmake
@@ -8,13 +8,6 @@
 ## DAP Link implementation in pyocd is underway,
 ## until then jlink can be used or copy image to storage
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-endif()
-
 if(CONFIG_BOARD_LPCXPRESSO55S69_CPU0)
 board_runner_args(jlink "--device=LPC55S69_core0")
 endif()
diff --git a/boards/arm/mimxrt1010_evk/board.cmake b/boards/arm/mimxrt1010_evk/board.cmake
index 68e0f2621f2..7a846f900c4 100644
--- a/boards/arm/mimxrt1010_evk/board.cmake
+++ b/boards/arm/mimxrt1010_evk/board.cmake
@@ -3,12 +3,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-endif()
 
 board_runner_args(jlink "--device=MIMXRT1011")
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/arm/mimxrt1015_evk/board.cmake b/boards/arm/mimxrt1015_evk/board.cmake
index e04bc6d965f..6149adcb438 100644
--- a/boards/arm/mimxrt1015_evk/board.cmake
+++ b/boards/arm/mimxrt1015_evk/board.cmake
@@ -3,12 +3,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-endif()
 
 board_runner_args(jlink "--device=MIMXRT1015")
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/arm/mimxrt1020_evk/board.cmake b/boards/arm/mimxrt1020_evk/board.cmake
index faacd6864b8..f3c9ac623ed 100644
--- a/boards/arm/mimxrt1020_evk/board.cmake
+++ b/boards/arm/mimxrt1020_evk/board.cmake
@@ -4,18 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(pyocd "--target=mimxrt1020")
 board_runner_args(jlink "--device=MIMXRT1021xxx5A")
 
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/arm/mimxrt1050_evk/board.cmake b/boards/arm/mimxrt1050_evk/board.cmake
index 5541cfe6901..4955f0753b6 100644
--- a/boards/arm/mimxrt1050_evk/board.cmake
+++ b/boards/arm/mimxrt1050_evk/board.cmake
@@ -4,18 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(pyocd "--target=mimxrt1050_hyperflash")
 board_runner_args(jlink "--device=MCIMXRT1052")
 
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/arm/mimxrt1060_evk/board.cmake b/boards/arm/mimxrt1060_evk/board.cmake
index 2ef5a2ba122..61e534fe2dc 100644
--- a/boards/arm/mimxrt1060_evk/board.cmake
+++ b/boards/arm/mimxrt1060_evk/board.cmake
@@ -4,18 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(pyocd "--target=cortex_m")
 board_runner_args(jlink "--device=MIMXRT1062xxx6A")
 
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/arm/mimxrt1064_evk/board.cmake b/boards/arm/mimxrt1064_evk/board.cmake
index 17deca05336..cbbf36ea104 100644
--- a/boards/arm/mimxrt1064_evk/board.cmake
+++ b/boards/arm/mimxrt1064_evk/board.cmake
@@ -4,18 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(pyocd "--target=cortex_m")
 board_runner_args(jlink "--device=MIMXRT1064")
 
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/arm/twr_ke18f/board.cmake b/boards/arm/twr_ke18f/board.cmake
index 8cae7d27051..cbe6b2dd7cf 100644
--- a/boards/arm/twr_ke18f/board.cmake
+++ b/boards/arm/twr_ke18f/board.cmake
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW daplink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-elseif(OPENSDA_FW STREQUAL daplink)
-  board_set_debugger_ifnset(pyocd)
-  board_set_flasher_ifnset(pyocd)
-endif()
-
 board_runner_args(jlink "--device=MKE18F512xxx16")
 board_runner_args(pyocd "--target=ke18f16")
 
diff --git a/boards/arm/twr_ke18f/doc/index.rst b/boards/arm/twr_ke18f/doc/index.rst
index 5d8e1ae6dbe..ad1493177b7 100644
--- a/boards/arm/twr_ke18f/doc/index.rst
+++ b/boards/arm/twr_ke18f/doc/index.rst
@@ -163,13 +163,14 @@ path.
 Follow the instructions in :ref:`opensda-jlink-onboard-debug-probe` to program
 the `OpenSDA J-Link Firmware for TWR-KE18F`_.
 
-Add the argument ``-DOPENSDA_FW=jlink`` when you invoke ``west build`` to
-override the default runner from pyOCD to J-Link:
+Add the arguments ``-DBOARD_FLASH_RUNNER=jlink`` and
+``-DBOARD_DEBUG_RUNNER=jlink`` when you invoke ``west build`` to override the
+default runner from pyOCD to J-Link:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :board: twr_ke18f
-   :gen-args: -DOPENSDA_FW=jlink
+   :gen-args: -DBOARD_FLASH_RUNNER=jlink -DBOARD_DEBUG_RUNNER=jlink
    :goals: build
 
 Configuring a Console
diff --git a/boards/arm/twr_kv58f220m/board.cmake b/boards/arm/twr_kv58f220m/board.cmake
index 3121a63089c..cdf53073e8b 100644
--- a/boards/arm/twr_kv58f220m/board.cmake
+++ b/boards/arm/twr_kv58f220m/board.cmake
@@ -1,12 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set_ifndef(OPENSDA_FW jlink)
-
-if(OPENSDA_FW STREQUAL jlink)
-  board_set_debugger_ifnset(jlink)
-  board_set_flasher_ifnset(jlink)
-endif()
-
 board_runner_args(jlink "--device=MKV58F1M0xxx24")
 
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)