Merge branch 'mueller/master' into mueller/yocto-rootfs

CMakeLists.txt

@@ -16,7 +16,10 @@ set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
 option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
-
+option(EIVE_HARDCODED_TOOLCHAIN_FILE "\
+For Linux Board Target BSPs, a default toolchain file will be set. Should be set to OFF \
+if a different toolchain file is set externally" ON
+)
 option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
 option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" ON)
 
@@ -41,7 +44,7 @@ include(${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake)
 pre_project_config()
 
 # Check whether the user has already installed Catch2 first. This has to come before
-# the project call. We could also exlcude doing this when the Q7S primary OBSW is built..
+# the project call. We could also exclude doing this when the Q7S primary OBSW is built..
 find_package(Catch2 3 CONFIG QUIET)
 
 # Project Name
@@ -247,8 +250,13 @@ else()
 endif()
 set_target_properties(${OBSW_NAME} PROPERTIES OUTPUT_NAME ${OBSW_BIN_NAME})
 
-#watchdog
-add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
+# Watchdog
+if(TGT_BSP MATCHES "arm/q7s")
+    add_executable(${WATCHDOG_NAME})
+else()
+    add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
+endif()
+
 add_subdirectory(${WATCHDOG_PATH}) 
 target_link_libraries(${WATCHDOG_NAME} PUBLIC
     ${LIB_CXX_FS}
@@ -373,7 +381,7 @@ endif()
 
 
 
-if(${CMAKE_CROSSCOMPILING})
+if(CMAKE_CROSSCOMPILING)
 	include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake)
 	post_source_hw_os_config()
 endif()

README.md

@@ -163,23 +163,26 @@ automatically.
 
 The EIVE OBSW is the default target if no target is specified.
 
+**Debug**
+
 ```sh
 mkdir build-Debug-Q7S && cd build-Debug-Q7S
 cmake -DTGT_BSP=arm/q7s -DCMAKE_BUILD_TYPE=Debug ..
 cmake --build . -j
 ```
 
-### Q7S Watchdog
-
-To build the EIVE watchdog, the corresponding target must be specified in the build command.
-The configure steps do not need to be repeated if the folder has already been configured.
+**Release**
 
 ```sh
-mkdir build-Debug-Watchdog && cd build-Debug-Watchdog
-cmake -DTGT_BSP=arm/q7s -DCMAKE_BUILD_TYPE=Debug ..
-cmake --build . --target eive-watchdog -j
+mkdir build-Release-Q7S && cd build-Release-Q7S
+cmake -DTGT_BSP=arm/q7s -DCMAKE_BUILD_TYPE=Release ..
+cmake --build . -j
 ```
 
+### Q7S Watchdog
+
+The watchdog will be built along side the primary OBSW binary.
+
 ### Hosted
 
 You can also use the FSFW OSAL `host` to build on Windows or for generic OSes.

cmake/PreProjectConfig.cmake

@@ -11,7 +11,7 @@ endif()
 
 
 # Disable compiler checks for cross-compiling.
-if(FSFW_OSAL MATCHES linux AND TGT_BSP)
+if(FSFW_OSAL MATCHES linux AND TGT_BSP AND EIVE_HARDCODED_TOOLCHAIN_FILE)
 	if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/te0720-1cfa")
 		set(CMAKE_TOOLCHAIN_FILE 
 			"${CMAKE_SCRIPT_PATH}/Zynq7020CrossCompileConfig.cmake"

fsfw

@@ -1 +1 @@
-Subproject commit 96babff67ea7859cc9802db63c5d07a7f64c8255
+Subproject commit e68873ec924a4d530291a811976379232fde034e