diff --git a/boards/arm/beagle_bcf/board.cmake b/boards/arm/beagle_bcf/board.cmake index 84d7457e7b1b34..591d74dffb1ed1 100644 --- a/boards/arm/beagle_bcf/board.cmake +++ b/boards/arm/beagle_bcf/board.cmake @@ -5,5 +5,6 @@ # Download cc2538-bsl.py from https://git.beagleboard.org/beagleconnect/zephyr/cc2538-bsl/-/tags/2.1-bcf -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher $ENV{ZEPHYR_BASE}/boards/arm/beagle_bcf/cc2538-bsl.py -w) +board_runner_args(misc-flasher $ENV{ZEPHYR_BASE}/boards/arm/beagle_bcf/cc2538-bsl.py -w) + +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/arm/mec172xevb_assy6906/board.cmake b/boards/arm/mec172xevb_assy6906/board.cmake index 840168650d4603..9fd56ecb59f265 100644 --- a/boards/arm/mec172xevb_assy6906/board.cmake +++ b/boards/arm/mec172xevb_assy6906/board.cmake @@ -11,4 +11,4 @@ board_finalize_runner_args(dediprog ) # This allows a custom script to be used for flashing the SPI chip. -include(${ZEPHYR_BASE}/boards/common/misc.board.cmake) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/riscv/it8xxx2_evb/board.cmake b/boards/riscv/it8xxx2_evb/board.cmake index 6a3abe8ddd9157..77814a0e2a9983 100644 --- a/boards/riscv/it8xxx2_evb/board.cmake +++ b/boards/riscv/it8xxx2_evb/board.cmake @@ -1,4 +1,3 @@ set(SUPPORTED_EMU_PLATFORMS renode) set(RENODE_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/support/it8xxx2_evb.resc) -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/x86/acrn/board.cmake b/boards/x86/acrn/board.cmake index 6b01bab2aeea87..53e1da3ea1ec32 100644 --- a/boards/x86/acrn/board.cmake +++ b/boards/x86/acrn/board.cmake @@ -1,4 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/x86/ehl_crb/board.cmake b/boards/x86/ehl_crb/board.cmake index 6b01bab2aeea87..53e1da3ea1ec32 100644 --- a/boards/x86/ehl_crb/board.cmake +++ b/boards/x86/ehl_crb/board.cmake @@ -1,4 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/x86/rpl_crb/board.cmake b/boards/x86/rpl_crb/board.cmake index 6b01bab2aeea87..53e1da3ea1ec32 100644 --- a/boards/x86/rpl_crb/board.cmake +++ b/boards/x86/rpl_crb/board.cmake @@ -1,4 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/x86/up_squared/board.cmake b/boards/x86/up_squared/board.cmake index 6b01bab2aeea87..53e1da3ea1ec32 100644 --- a/boards/x86/up_squared/board.cmake +++ b/boards/x86/up_squared/board.cmake @@ -1,4 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) diff --git a/boards/xtensa/intel_adsp_cavs25/board.cmake b/boards/xtensa/intel_adsp_cavs25/board.cmake index 8d7f36e07bd2aa..dca9d1c6e0cca6 100644 --- a/boards/xtensa/intel_adsp_cavs25/board.cmake +++ b/boards/xtensa/intel_adsp_cavs25/board.cmake @@ -1,8 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 if($ENV{CAVS_OLD_FLASHER}) - board_set_flasher_ifnset(misc-flasher) - board_finalize_runner_args(misc-flasher) + include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) endif() board_set_flasher_ifnset(intel_adsp) diff --git a/boards/xtensa/nxp_adsp_imx8/board.cmake b/boards/xtensa/nxp_adsp_imx8/board.cmake index 7ae22465082ced..b4f23bfe8680fa 100644 --- a/boards/xtensa/nxp_adsp_imx8/board.cmake +++ b/boards/xtensa/nxp_adsp_imx8/board.cmake @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) board_set_rimage_target(imx8) diff --git a/boards/xtensa/nxp_adsp_imx8m/board.cmake b/boards/xtensa/nxp_adsp_imx8m/board.cmake index 4fb52dc2d292fb..966cfd6ce1264a 100644 --- a/boards/xtensa/nxp_adsp_imx8m/board.cmake +++ b/boards/xtensa/nxp_adsp_imx8m/board.cmake @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) board_set_rimage_target(imx8m) diff --git a/boards/xtensa/nxp_adsp_imx8x/board.cmake b/boards/xtensa/nxp_adsp_imx8x/board.cmake index 7ae22465082ced..b4f23bfe8680fa 100644 --- a/boards/xtensa/nxp_adsp_imx8x/board.cmake +++ b/boards/xtensa/nxp_adsp_imx8x/board.cmake @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -board_set_flasher_ifnset(misc-flasher) -board_finalize_runner_args(misc-flasher) +include(${ZEPHYR_BASE}/boards/common/misc-flasher.board.cmake) board_set_rimage_target(imx8)