boards: allow cmake-time overrides of all runners

Convert all board_set_xxer(foo) calls to board_set_xxer_ifndef(foo), which allows the user to make their own decision at CMake time. Signed-off-by: Marti Bolivar <marti.bolivar@nordicsemi.no>
2019-05-31 17:57:16 -06:00 · 2019-05-31 17:57:16 -06:00 · 35d4e62300
commit 35d4e62300
parent 1717332c7a
19 changed files with 30 additions and 30 deletions
--- a/boards/arc/arduino_101_sss/board.cmake
+++ b/boards/arc/arduino_101_sss/board.cmake
@ -1,12 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0

 if(DEFINED ENV{ZEPHYR_FLASH_OVER_DFU})
-  board_set_flasher(dfu-util)
+  board_set_flasher_ifnset(dfu-util)
 else()
-  board_set_flasher(openocd)
+  board_set_flasher_ifnset(openocd)
 endif()

-board_set_debugger(openocd)
+board_set_debugger_ifnset(openocd)

 board_runner_args(dfu-util "--pid=8087:0aba" "--alt=sensor_core")
 board_runner_args(openocd --cmd-pre-load "targets 1" "--gdb-port=3334")
--- a/boards/arc/em_starterkit/board.cmake
+++ b/boards/arc/em_starterkit/board.cmake
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0

 # TODO: can this board just use the usual openocd runner?
-board_set_flasher(em-starterkit)
-board_set_debugger(em-starterkit)
+board_set_flasher_ifnset(em-starterkit)
+board_set_debugger_ifnset(em-starterkit)
 board_finalize_runner_args(em-starterkit)
--- a/boards/arc/iotdk/board.cmake
+++ b/boards/arc/iotdk/board.cmake
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0

 # TODO: can this board just use the usual openocd runner?
-board_set_flasher(em-starterkit)
-board_set_debugger(em-starterkit)
+board_set_flasher_ifnset(em-starterkit)
+board_set_debugger_ifnset(em-starterkit)
 board_finalize_runner_args(em-starterkit)
--- a/boards/arc/nsim/board.cmake
+++ b/boards/arc/nsim/board.cmake
@ -2,8 +2,8 @@

 set(EMU_PLATFORM nsim)

-board_set_flasher(arc-nsim)
-board_set_debugger(arc-nsim)
+board_set_flasher_ifnset(arc-nsim)
+board_set_debugger_ifnset(arc-nsim)

 if(${CONFIG_SOC_NSIM_EM})
 board_runner_args(arc-nsim "--props=nsim_em.props")
--- a/boards/arm/mps2_an385/board.cmake
+++ b/boards/arm/mps2_an385/board.cmake
@ -10,4 +10,4 @@ set(QEMU_FLAGS_${ARCH}
  -vga none
  )

-board_set_debugger(qemu)
+board_set_debugger_ifnset(qemu)
--- a/boards/arm/nrf52_sparkfun/board.cmake
+++ b/boards/arm/nrf52_sparkfun/board.cmake
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0

-board_set_flasher(pyocd.sh)
-board_set_debugger(pyocd.sh)
+board_set_flasher_ifnset(pyocd.sh)
+board_set_debugger_ifnset(pyocd.sh)

 set(PYOCD_TARGET nrf52)

--- a/boards/arm/qemu_cortex_m3/board.cmake
+++ b/boards/arm/qemu_cortex_m3/board.cmake
@ -10,4 +10,4 @@ set(QEMU_FLAGS_${ARCH}
  -vga none
  )

-board_set_debugger(qemu)
+board_set_debugger_ifnset(qemu)
--- a/boards/arm/v2m_beetle/board.cmake
+++ b/boards/arm/v2m_beetle/board.cmake
@ -1,3 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0

-board_set_debugger(openocd)
+board_set_debugger_ifnset(openocd)
--- a/boards/common/esp32.board.cmake
+++ b/boards/common/esp32.board.cmake
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0

-board_set_flasher(esp32)
+board_set_flasher_ifnset(esp32)

 if(NOT DEFINED ESP_IDF_PATH)
  if(DEFINED ENV{ESP_IDF_PATH})
--- a/boards/nios2/qemu_nios2/board.cmake
+++ b/boards/nios2/qemu_nios2/board.cmake
@ -9,4 +9,4 @@ set(QEMU_FLAGS_${ARCH}
  -nographic
  )

-board_set_debugger(qemu)
+board_set_debugger_ifnset(qemu)
--- a/boards/riscv32/hifive1/board.cmake
+++ b/boards/riscv32/hifive1/board.cmake
@ -9,6 +9,6 @@ set(QEMU_FLAGS_${ARCH}
  -machine sifive_e
  )

-board_set_debugger(qemu)
-board_set_flasher(hifive1)
+board_set_debugger_ifnset(qemu)
+board_set_flasher_ifnset(hifive1)
 board_finalize_runner_args(hifive1)
--- a/boards/riscv32/qemu_riscv32/board.cmake
+++ b/boards/riscv32/qemu_riscv32/board.cmake
@ -9,4 +9,4 @@ set(QEMU_FLAGS_${ARCH}
  -machine sifive_e
  )

-board_set_debugger(qemu)
+board_set_debugger_ifnset(qemu)
--- a/boards/x86/arduino_101/board.cmake
+++ b/boards/x86/arduino_101/board.cmake
@ -1,10 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0

 if(DEFINED ENV{ZEPHYR_FLASH_OVER_DFU})
-  board_set_flasher(dfu-util)
+  board_set_flasher_ifnset(dfu-util)
 endif()

-board_set_debugger(openocd)
+board_set_debugger_ifnset(openocd)

 board_runner_args(dfu-util "--pid=8087:0aba" "--alt=x86_app")
 board_runner_args(openocd --cmd-pre-load "targets 1")
--- a/boards/x86/qemu_x86/board.cmake
+++ b/boards/x86/qemu_x86/board.cmake
@ -17,6 +17,6 @@ set(QEMU_FLAGS_${ARCH}
  )

 # TODO: Support debug
-# board_set_debugger(qemu)
+# board_set_debugger_ifnset(qemu)
 # debugserver: QEMU_EXTRA_FLAGS += -s -S
 # debugserver: qemu
--- a/boards/x86/tinytile/board.cmake
+++ b/boards/x86/tinytile/board.cmake
@ -1,10 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0

 if(DEFINED ENV{ZEPHYR_FLASH_OVER_DFU})
-  board_set_flasher(dfu-util)
+  board_set_flasher_ifnset(dfu-util)
 endif()

-board_set_debugger(openocd)
+board_set_debugger_ifnset(openocd)

 board_runner_args(dfu-util "--pid=8087:0aba" "--alt=x86_app")
 board_runner_args(openocd --cmd-pre-load "targets 1")
--- a/boards/x86/x86_jailhouse/board.cmake
+++ b/boards/x86/x86_jailhouse/board.cmake
@ -37,6 +37,6 @@ set(QEMU_FLAGS_${ARCH}
  )

 # TODO: Support debug
-# board_set_debugger(qemu)
+# board_set_debugger_ifnset(qemu)
 # debugserver: QEMU_EXTRA_FLAGS += -s -S
 # debugserver: qemu
--- a/boards/xtensa/intel_s1000_crb/board.cmake
+++ b/boards/xtensa/intel_s1000_crb/board.cmake
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0

-board_set_flasher(intel_s1000)
-board_set_debugger(intel_s1000)
+board_set_flasher_ifnset(intel_s1000)
+board_set_debugger_ifnset(intel_s1000)

 board_finalize_runner_args(intel_s1000
  "--xt-ocd-dir=/opt/tensilica/xocd-12.0.4/xt-ocd"
--- a/boards/xtensa/qemu_xtensa/board.cmake
+++ b/boards/xtensa/qemu_xtensa/board.cmake
@ -9,6 +9,6 @@ set(QEMU_FLAGS_${ARCH}
  )

 # TODO: Support debug
-# board_set_debugger(qemu)
+# board_set_debugger_ifnset(qemu)
 # debugserver: QEMU_EXTRA_FLAGS += -s -S
 # debugserver: qemu
--- a/boards/xtensa/xt-sim/board.cmake
+++ b/boards/xtensa/xt-sim/board.cmake
@ -1,3 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0

-board_set_debugger(xtensa)
+board_set_debugger_ifnset(xtensa)