eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Update for new yocto rootfs #217

Merged
meierj merged 38 commits from mueller/yocto-rootfs into develop 2022-04-22 10:21:54 +02:00
Conversation 0 Commits 38 Files Changed 19 +10 -5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f23ba7ab7b - Show all commits

9
CMakeLists.txt
View File

@ -250,8 +250,13 @@ else()
endif() endif()
set_target_properties(${OBSW_NAME} PROPERTIES OUTPUT_NAME ${OBSW_BIN_NAME}) set_target_properties(${OBSW_NAME} PROPERTIES OUTPUT_NAME ${OBSW_BIN_NAME})
#watchdog # Watchdog
if(TGT_BSP MATCHES "arm/q7s")
add_executable(${WATCHDOG_NAME})
else()
add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL) add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
endif()
add_subdirectory(${WATCHDOG_PATH}) add_subdirectory(${WATCHDOG_PATH})
target_link_libraries(${WATCHDOG_NAME} PUBLIC target_link_libraries(${WATCHDOG_NAME} PUBLIC
${LIB_CXX_FS} ${LIB_CXX_FS}
@ -376,7 +381,7 @@ endif()
if(${CMAKE_CROSSCOMPILING}) if(CMAKE_CROSSCOMPILING)
include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake) include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake)
post_source_hw_os_config() post_source_hw_os_config()
endif() endif()

2
cmake/PreProjectConfig.cmake
View File

@ -11,7 +11,7 @@ endif()
# Disable compiler checks for cross-compiling. # 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") if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/te0720-1cfa")
set(CMAKE_TOOLCHAIN_FILE set(CMAKE_TOOLCHAIN_FILE
"${CMAKE_SCRIPT_PATH}/Zynq7020CrossCompileConfig.cmake" "${CMAKE_SCRIPT_PATH}/Zynq7020CrossCompileConfig.cmake"

2
fsfw

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