fsfw/fsfw-example-linux-mcu
fsfw/fsfw-example-linux-mcu
11
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

toolchain magic optional now

Browse Source
This commit is contained in:
Robin Müller 2021-08-02 16:21:40 +02:00
parent e56b4dcd56
commit 46a5765593
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -20,10 +20,18 @@ endif()
if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack") if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
option(LINUX_CROSS_COMPILE "Cross compile for a Linux board" ON) option(LINUX_CROSS_COMPILE "Cross compile for a Linux board" ON)
set(FSFW_HAL_ADD_LINUX "Add the FSFW HAL for Linux systems" ON) set(FSFW_HAL_ADD_LINUX "Add the FSFW HAL for Linux systems" ON)
option(FSFW_BBB_TOOLCHAIN_FILE_MAGIC
"Perform library magic in toolchain file. Might be removed soon"
OFF
)
endif() endif()
if(TGT_BSP MATCHES "arm/raspberrypi") if(TGT_BSP MATCHES "arm/raspberrypi")
set(FSFW_HAL_ADD_RASPBERRY_PI "Add Raspberry Pi specific HAL files" ON) set(FSFW_HAL_ADD_RASPBERRY_PI "Add Raspberry Pi specific HAL files" ON)
option(FSFW_RPI_TOOLCHAIN_FILE_MAGIC
"Perform library magic in toolchain file. Might be removed soon"
OFF
)
endif() endif()
# Perform steps like loading toolchain files where applicable. # Perform steps like loading toolchain files where applicable.

2
cmake/BBBCrossCompileConfig.cmake
View File

@ -68,6 +68,7 @@ set(CMAKE_SYSROOT "${SYSROOT_PATH}")
set(CMAKE_SYSTEM_NAME "Linux") set(CMAKE_SYSTEM_NAME "Linux")
set(CMAKE_SYSTEM_PROCESSOR "arm") set(CMAKE_SYSTEM_PROCESSOR "arm")
if(FSFW_BBB_TOOLCHAIN_FILE_MAGIC)
# List of library dirs where LD has to look. Pass them directly through gcc. # List of library dirs where LD has to look. Pass them directly through gcc.
# LD_LIBRARY_PATH is not evaluated by arm-*-ld # LD_LIBRARY_PATH is not evaluated by arm-*-ld
set(LIB_DIRS set(LIB_DIRS
@ -82,6 +83,7 @@ set(COMMON_FLAGS "-I${SYSROOT_PATH}/usr/include")
foreach(LIB ${LIB_DIRS}) foreach(LIB ${LIB_DIRS})
set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}") set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}")
endforeach() endforeach()
endif()
set(CMAKE_C_FLAGS set(CMAKE_C_FLAGS
"-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard ${COMMON_FLAGS}" "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard ${COMMON_FLAGS}"

2
cmake/RPiCrossCompileConfig.cmake
View File

@ -83,6 +83,7 @@ else()
set(CMAKE_SYSTEM_PROCESSOR "arm") set(CMAKE_SYSTEM_PROCESSOR "arm")
endif() endif()
if(FSFW_RPI_TOOLCHAIN_FILE_MAGIC)
# List of library dirs where LD has to look. Pass them directly through gcc. # List of library dirs where LD has to look. Pass them directly through gcc.
# LD_LIBRARY_PATH is not evaluated by arm-*-ld # LD_LIBRARY_PATH is not evaluated by arm-*-ld
set(LIB_DIRS set(LIB_DIRS
@ -100,6 +101,7 @@ set(COMMON_FLAGS "-I${SYSROOT_PATH}/usr/include")
foreach(LIB ${LIB_DIRS}) foreach(LIB ${LIB_DIRS})
set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}") set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}")
endforeach() endforeach()
endif()
if(RASPBERRY_VERSION VERSION_GREATER 3) if(RASPBERRY_VERSION VERSION_GREATER 3)
set(CMAKE_C_FLAGS set(CMAKE_C_FLAGS

2
fsfw

@ -1 +1 @@
Subproject commit dee063e25928f8b24cbd3fc49130d453feb01dd4 Subproject commit 0e5cfcf28f0183d7286d1160a40dcff2017f7795