cmake: move flash/debug/run state to target properties

mbolivar-nordic · SebastianBoe · commit 24c862cea2ce · 2019-10-08T12:04:01.000+02:00
The BOARD_RUNNER_ARGS_&lt;runner&gt; and ZEPHYR_RUNNERS variables are really
about the particular zephyr image that's being compiled: they're
specific to the board and even the application.

The same is true of the QEMU_FLAGS_${ARCH} and QEMU_CPU_TYPE_${ARCH}
variables set in various board files.

Make all of this state ZEPHYR_TARGET properties. This also lets us
move some qemu-specific stuff out of boilerplate.cmake into
qemu.cmake.

Signed-off-by: Marti Bolivar &lt;marti.bolivar@nordicsemi.no&gt;
Signed-off-by: Sebastian Bøe &lt;sebastian.boe@nordicsemi.no&gt;
diff --git a/boards/arm/mps2_an385/board.cmake b/boards/arm/mps2_an385/board.cmake
@@ -2,9 +2,9 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} cortex-m3)
-set(QEMU_FLAGS_${ARCH}
-  -cpu ${QEMU_CPU_TYPE_${ARCH}}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} cortex-m3)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
+  -cpu cortex-m3
   -machine mps2-an385
   -nographic
   -vga none
diff --git a/boards/arm/mps2_an521/board.cmake b/boards/arm/mps2_an521/board.cmake
@@ -2,9 +2,9 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} cortex-m33)
-set(QEMU_FLAGS_${ARCH}
-  -cpu ${QEMU_CPU_TYPE_${ARCH}}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} cortex-m33)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
+  -cpu cortex-m33
   -machine mps2-an521
   -nographic
   -m 16
diff --git a/boards/arm/qemu_cortex_m0/board.cmake b/boards/arm/qemu_cortex_m0/board.cmake
@@ -5,9 +5,9 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} cortex-m0)
-set(QEMU_FLAGS_${ARCH}
-  -cpu ${QEMU_CPU_TYPE_${ARCH}}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} cortex-m0)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
+  -cpu cortex-m0
   -machine microbit
   -nographic
   -vga none
diff --git a/boards/arm/qemu_cortex_m3/board.cmake b/boards/arm/qemu_cortex_m3/board.cmake
@@ -2,9 +2,9 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} cortex-m3)
-set(QEMU_FLAGS_${ARCH}
-  -cpu ${QEMU_CPU_TYPE_${ARCH}}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} cortex-m3)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
+  -cpu cortex-m3
   -machine lm3s6965evb
   -nographic
   -vga none
diff --git a/boards/arm/qemu_cortex_r5/board.cmake b/boards/arm/qemu_cortex_r5/board.cmake
@@ -5,8 +5,8 @@
 set(EMU_PLATFORM qemu)
 set(QEMU_ARCH aarch64)
 
-set(QEMU_CPU_TYPE_${ARCH} cortex-r5)
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} cortex-r5)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
   -nographic
   -machine xlnx-zcu102
   -global xlnx,zynqmp.boot-cpu="rpu-cpu[0]"
diff --git a/boards/nios2/qemu_nios2/board.cmake b/boards/nios2/qemu_nios2/board.cmake
@@ -2,9 +2,8 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} nios2)
-
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} nios2)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
   -machine altera_10m50_zephyr
   -nographic
   )
diff --git a/boards/riscv/hifive1/board.cmake b/boards/riscv/hifive1/board.cmake
@@ -2,9 +2,8 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} riscv32)
-
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} riscv32)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
   -nographic
   -machine sifive_e
   )
diff --git a/boards/riscv/qemu_riscv32/board.cmake b/boards/riscv/qemu_riscv32/board.cmake
@@ -2,10 +2,9 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_binary_suffix riscv32)
-set(QEMU_CPU_TYPE_${ARCH} riscv32)
-
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_binary_suffix    riscv32)
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} riscv32)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
   -nographic
   -machine sifive_e
   )
diff --git a/boards/riscv/qemu_riscv64/board.cmake b/boards/riscv/qemu_riscv64/board.cmake
@@ -2,10 +2,9 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_binary_suffix riscv64)
-set(QEMU_CPU_TYPE_${ARCH} riscv64)
-
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_binary_suffix    riscv64)
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} riscv64)
+set_property(TARGET ${ZEPHYR_TARGET} PROPERTY QEMU_FLAGS_${ARCH}
   -nographic
   -machine sifive_e
   )
diff --git a/boards/x86/qemu_x86/board.cmake b/boards/x86/qemu_x86/board.cmake
@@ -7,13 +7,17 @@ if(NOT CONFIG_REBOOT)
 endif()
 
 if(CONFIG_X86_LONGMODE)
-  set(QEMU_binary_suffix x86_64)
+  set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_binary_suffix x86_64)
+endif()
+
+if(CONFIG_X86_LONGMODE)
   set(QEMU_CPU_TYPE_${ARCH} qemu64,+x2apic)
 else()
   set(QEMU_CPU_TYPE_${ARCH} qemu32,+nx,+pae)
 endif()
 
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} ${QEMU_CPU_TYPE_${ARCH}})
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
   -m 9
   -cpu ${QEMU_CPU_TYPE_${ARCH}}
   -device isa-debug-exit,iobase=0xf4,iosize=0x04
diff --git a/boards/x86_64/qemu_x86_64/board.cmake b/boards/x86_64/qemu_x86_64/board.cmake
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 set(EMU_PLATFORM qemu)
-set(QEMU_FLAGS_${ARCH} -nographic)
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_FLAGS_${ARCH} -nographic)
diff --git a/boards/xtensa/qemu_xtensa/board.cmake b/boards/xtensa/qemu_xtensa/board.cmake
@@ -2,9 +2,8 @@
 
 set(EMU_PLATFORM qemu)
 
-set(QEMU_CPU_TYPE_${ARCH} sample_controller)
-
-set(QEMU_FLAGS_${ARCH}
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES QEMU_CPU_TYPE_${ARCH} sample_controller)
+set_property(TARGET   ${ZEPHYR_TARGET} PROPERTY   QEMU_FLAGS_${ARCH}
 	-machine sim -semihosting -nographic -cpu sample_controller
   )
 
diff --git a/cmake/app/boilerplate.cmake b/cmake/app/boilerplate.cmake
@@ -492,35 +492,13 @@ add_custom_target(${ZEPHYR_TARGET})
 
 include(${BOARD_DIR}/board.cmake OPTIONAL)
 
-# If we are using a suitable ethernet driver inside qemu, then these options
-# must be set, otherwise a zephyr instance cannot receive any network packets.
-# The Qemu supported ethernet driver should define CONFIG_ETH_NIC_MODEL
-# string that tells what nic model Qemu should use.
-if(CONFIG_QEMU_TARGET)
-  if(CONFIG_NET_QEMU_ETHERNET)
-    if(CONFIG_ETH_NIC_MODEL)
-      list(APPEND QEMU_FLAGS_${ARCH}
-        -nic tap,model=${CONFIG_ETH_NIC_MODEL},script=no,downscript=no,ifname=zeth
-      )
-    else()
-      message(FATAL_ERROR "
-        No Qemu ethernet driver configured!
-        Enable Qemu supported ethernet driver like e1000 at drivers/ethernet"
-      )
-    endif()
-  else()
-    list(APPEND QEMU_FLAGS_${ARCH}
-      -net none
-    )
-  endif()
-endif()
-
 # "app" is a CMake library containing all the application code and is
 # modified by the entry point ${APPLICATION_SOURCE_DIR}/CMakeLists.txt
 # that was specified when cmake was called.
 zephyr_library_named(app)
 set_property(TARGET app PROPERTY ARCHIVE_OUTPUT_DIRECTORY app)
 
+# Add the main Zephyr build system file.
 add_subdirectory(${ZEPHYR_BASE} ${__build_dir})
 
 # Link 'app' with the Zephyr interface libraries.
diff --git a/cmake/emu/qemu.cmake b/cmake/emu/qemu.cmake
@@ -1,11 +1,37 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if("${ARCH}" STREQUAL "x86")
-  set_ifndef(QEMU_binary_suffix i386)
+# If we are using a suitable ethernet driver inside qemu, then these options
+# must be set, otherwise a zephyr instance cannot receive any network packets.
+# The Qemu supported ethernet driver should define CONFIG_ETH_NIC_MODEL
+# string that tells what nic model Qemu should use.
+if(CONFIG_QEMU_TARGET)
+  if(CONFIG_NET_QEMU_ETHERNET)
+    if(CONFIG_ETH_NIC_MODEL)
+      set_property(TARGET ${ZEPHYR_TARGET} APPEND PROPERTY QEMU_FLAGS_${ARCH}
+        -nic tap,model=${CONFIG_ETH_NIC_MODEL},script=no,downscript=no,ifname=zeth
+      )
+    else()
+      message(FATAL_ERROR "
+        No Qemu ethernet driver configured!
+        Enable Qemu supported ethernet driver like e1000 at drivers/ethernet"
+      )
+    endif()
+  else()
+    set_property(TARGET ${ZEPHYR_TARGET} APPEND PROPERTY QEMU_FLAGS_${ARCH}
+      -net none
+    )
+  endif()
+endif()
+
+get_target_property(QEMU_binary_suffix ${ZEPHYR_TARGET} QEMU_binary_suffix)
+if(QEMU_binary_suffix)
+  # Do nothing
+elseif("${ARCH}" STREQUAL "x86")
+  set(QEMU_binary_suffix i386)
 elseif(DEFINED QEMU_ARCH)
-  set_ifndef(QEMU_binary_suffix ${QEMU_ARCH})
+  set(QEMU_binary_suffix ${QEMU_ARCH})
 else()
-  set_ifndef(QEMU_binary_suffix ${ARCH})
+  set(QEMU_binary_suffix ${ARCH})
 endif()
 
 set(qemu_alternate_path $ENV{QEMU_BIN_PATH})
@@ -276,21 +302,23 @@ elseif(NOT DEFINED QEMU_KERNEL_OPTION)
   set(QEMU_KERNEL_OPTION "-kernel;$<TARGET_FILE:${logical_target_for_zephyr_elf}>")
 endif()
 
+get_target_property(qemu_flags_arch ${ZEPHYR_TARGET} QEMU_FLAGS_${ARCH})
+get_target_property(qemu_cpu_type_arch ${ZEPHYR_TARGET} QEMU_CPU_TYPE_${ARCH})
 foreach(target ${qemu_targets})
   add_custom_target(${target}
     ${PRE_QEMU_COMMANDS}
     ${PRE_QEMU_COMMANDS_FOR_${target}}
     COMMAND
     ${QEMU}
-    ${QEMU_FLAGS_${ARCH}}
+    ${qemu_flags_arch}
     ${QEMU_FLAGS}
     ${QEMU_EXTRA_FLAGS}
     ${MORE_FLAGS_FOR_${target}}
     ${QEMU_SMP_FLAGS}
     ${QEMU_KERNEL_OPTION}
     DEPENDS ${logical_target_for_zephyr_elf}
     WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}
-    COMMENT "${QEMU_PIPE_COMMENT}[QEMU] CPU: ${QEMU_CPU_TYPE_${ARCH}}"
+    COMMENT "${QEMU_PIPE_COMMENT}[QEMU] CPU: ${qemu_cpu_type_arch}"
     USES_TERMINAL
     )
   if(DEFINED QEMU_KERNEL_FILE)
diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake
@@ -637,7 +637,7 @@ endmacro()
 function(board_runner_args runner)
   string(MAKE_C_IDENTIFIER ${runner} runner_id)
   # Note the "_EXPLICIT_" here, and see below.
-  set_property(GLOBAL APPEND PROPERTY BOARD_RUNNER_ARGS_EXPLICIT_${runner_id} ${ARGN})
+  set_property(TARGET ${ZEPHYR_TARGET} APPEND PROPERTY BOARD_RUNNER_ARGS_EXPLICIT_${runner_id} ${ARGN})
 endfunction()
 
 # This function is intended for internal use by
@@ -666,19 +666,19 @@ function(board_finalize_runner_args runner)
 
   # Retrieve the list of explicitly set arguments.
   string(MAKE_C_IDENTIFIER ${runner} runner_id)
-  get_property(explicit GLOBAL PROPERTY "BOARD_RUNNER_ARGS_EXPLICIT_${runner_id}")
+  get_target_property(explicit "${ZEPHYR_TARGET}" "BOARD_RUNNER_ARGS_EXPLICIT_${runner_id}")
 
   # Note no _EXPLICIT_ here. This property contains the final list.
-  set_property(GLOBAL APPEND PROPERTY BOARD_RUNNER_ARGS_${runner_id}
+  set_property(TARGET ${ZEPHYR_TARGET} APPEND PROPERTY BOARD_RUNNER_ARGS_${runner_id}
     # Default arguments from the common runner file come first.
     ${ARGN}
     # Arguments explicitly given with board_runner_args() come
     # last, so they take precedence.
     ${explicit}
     )
 
-  # Add the finalized runner to the global property list.
-  set_property(GLOBAL APPEND PROPERTY ZEPHYR_RUNNERS ${runner})
+  # Add the finalized runner to the list in the ZEPHYR_RUNNERS property.
+  set_property(TARGET ${ZEPHYR_TARGET} APPEND PROPERTY ZEPHYR_RUNNERS ${runner})
 endfunction()
 
 # 1.5. Misc.
diff --git a/cmake/flash/CMakeLists.txt b/cmake/flash/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-get_property(RUNNERS GLOBAL PROPERTY ZEPHYR_RUNNERS)
+get_target_property(RUNNERS ${ZEPHYR_TARGET} ZEPHYR_RUNNERS)
 
 # Enable verbose output, if requested.
 if(CMAKE_VERBOSE_MAKEFILE)
@@ -58,7 +58,7 @@ if(RUNNERS)
   foreach(runner ${RUNNERS})
     string(MAKE_C_IDENTIFIER ${runner} runner_id)
     # E.g. args = BOARD_RUNNER_ARGS_openocd, BOARD_RUNNER_ARGS_dfu_util, etc.
-    get_property(runner_args GLOBAL PROPERTY "BOARD_RUNNER_ARGS_${runner_id}")
+    get_target_property(runner_args ${ZEPHYR_TARGET} "BOARD_RUNNER_ARGS_${runner_id}")
     set(ZEPHYR_RUNNER_ARGS_${runner_id} ${runner_args} CACHE STRING
       "Runner-specific arguments for ${runner}" FORCE)
   endforeach()
