always build watchdog for arm q7s now

This commit is contained in:
Robin Müller 2022-04-20 01:25:56 +02:00
parent c4220b37e5
commit f23ba7ab7b
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 10 additions and 5 deletions

View File

@ -250,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}
@ -376,7 +381,7 @@ endif()
if(${CMAKE_CROSSCOMPILING})
if(CMAKE_CROSSCOMPILING)
include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake)
post_source_hw_os_config()
endif()

View File

@ -11,7 +11,7 @@ endif()
# Disable compiler checks for cross-compiling.
if(FSFW_OSAL MATCHES linux AND TGT_BSP AND NOT EIVE_HARDCODED_TOOLCHAIN_FILE)
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"

2
fsfw

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