fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 18:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Kconfig] CI fixes and SITL fix

Browse Source
This commit is contained in:
Peter van der Perk
2021-10-07 10:09:01 -04:00
committed by Daniel Agar
parent 6d0829c251
commit 5542402ca0
9 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/kconfig.cmake
+10
View File
@@ -23,6 +23,8 @@ set(COMMON_KCONFIG_ENV_SETTINGS
TOOLCHAIN=${CMAKE_TOOLCHAIN_FILE}
ARCHITECTURE=${CMAKE_SYSTEM_PROCESSOR}
ROMFSROOT=${config_romfs_root}
HAS_CUSTOM_BOARD_KCONFIG=${HAS_CUSTOM_BOARD_KCONFIG}
CUSTOM_BOARD_KCONFIG=${CUSTOM_BOARD_KCONFIG}
)
if(EXISTS ${BOARD_DEFCONFIG})
@@ -299,6 +301,14 @@ if(EXISTS ${BOARD_DEFCONFIG})
add_definitions( "-D__PX4_LINUX" )
endif()
if(LOCKSTEP)
set(ENABLE_LOCKSTEP_SCHEDULER yes)
endif()
if(NOLOCKSTEP)
set(ENABLE_LOCKSTEP_SCHEDULER no)
endif()
include(px4_impl_os)
px4_os_prebuild_targets(OUT prebuild_targets BOARD ${PX4_BOARD})
cmake/px4_config.cmake
+12
View File
@@ -111,3 +111,15 @@ set(PX4_CONFIG "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}" CACHE
if(EXISTS "${PX4_BOARD_DIR}/uavcan_board_identity")
include ("${PX4_BOARD_DIR}/uavcan_board_identity")
endif()
if(EXISTS "${PX4_BOARD_DIR}/sitl.cmake")
include ("${PX4_BOARD_DIR}/sitl.cmake")
endif()
set(CUSTOM_BOARD_KCONFIG "${PX4_BOARD_DIR}/Kconfig" CACHE STRING "PX4 board custom config" FORCE)
if(EXISTS ${CUSTOM_BOARD_KCONFIG})
set(HAS_CUSTOM_BOARD_KCONFIG "y" CACHE STRING "PX4 board custom config" FORCE)
else()
set(HAS_CUSTOM_BOARD_KCONFIG "n" CACHE STRING "PX4 board custom config" FORCE)
endif()