Merge pull request #773 from jphickey/fix-710-specify-processorid

Fix #710, Specify ProcessorID in targets.cmake

cmake/sample_defs/targets.cmake

@@ -5,11 +5,15 @@
 # This file indicates the architecture and configuration of the
 # target boards that will run core flight software.
 #
-# The following variables are defined per board, where <x> is the 
-# CPU number starting with 1:
+# The following variables are defined per board, where <x> is a
+# sequential index number starting with 1:
 #
 #  TGT<x>_NAME : the user-friendly name of the cpu.  Should be simple
 #       word with no punctuation.  This MUST be specified.
+#  TGT<x>_PROCESSORID : the default numeric ID for this processor at
+#       runtime.  If not specified, then the sequential index number is
+#       used.  This translates to the numeric value returned by
+#       CFE_PSP_GetProcessorId() at runtime.
 #  TGT<x>_APPLIST : list of applications to build and install on the CPU.
 #       These are built as dynamically-loaded applications and installed
 #       as files in the non-volatile storage of the target, and loaded

cmake/target/CMakeLists.txt

@@ -40,7 +40,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # The CPU ID and name are defined by the build scripts for this target
 if (DEFINED TGTID)
-  add_definitions(-DCFE_CPU_ID_VALUE=${TGTID})
+  if (DEFINED TGT${TGTID}_PROCESSORID)
+      add_definitions(-DCFE_CPU_ID_VALUE=${TGT${TGTID}_PROCESSORID})
+  else()
+      add_definitions(-DCFE_CPU_ID_VALUE=${TGTID})
+  endif()
 endif()
 if (DEFINED SPACECRAFT_ID)
   add_definitions(-DCFE_SPACECRAFT_ID_VALUE=${SPACECRAFT_ID})