mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-11-16 13:51:35 +08:00
Fix parameters building for nuttx protected/kernel builds
- Don't link to px4_layer - Don't link to flashparams; flashparams would work only in kernel side - Add missing link to px4_platform TODO: Make flashparams to work also in protected/kernel build. This would require using some real OS interface to the flash Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae> fix: bc2f28a68479e4f41017a7d254a263e9e3db5c1e Fix parameters building for nuttx protected/kernel builds Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
This commit is contained in:
@@ -148,7 +148,13 @@ if (NOT "${PX4_BOARD}" MATCHES "px4_io")
|
|||||||
px4_parameters.hpp
|
px4_parameters.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(parameters PRIVATE perf tinybson px4_layer)
|
target_link_libraries(parameters PRIVATE perf tinybson px4_platform)
|
||||||
|
|
||||||
|
# on NuttX protected build there are separate px4 layers for userspace and kernel
|
||||||
|
if (NOT ${PX4_PLATFORM} STREQUAL "nuttx" OR CONFIG_BUILD_FLAT)
|
||||||
|
target_link_libraries(parameters PRIVATE px4_layer)
|
||||||
|
endif()
|
||||||
|
|
||||||
target_compile_definitions(parameters PRIVATE -DMODULE_NAME="parameters")
|
target_compile_definitions(parameters PRIVATE -DMODULE_NAME="parameters")
|
||||||
target_compile_options(parameters
|
target_compile_options(parameters
|
||||||
PRIVATE
|
PRIVATE
|
||||||
@@ -160,7 +166,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
add_dependencies(parameters prebuild_targets)
|
add_dependencies(parameters prebuild_targets)
|
||||||
|
|
||||||
if(${PX4_PLATFORM} STREQUAL "nuttx")
|
if(${PX4_PLATFORM} STREQUAL "nuttx" AND CONFIG_BUILD_FLAT)
|
||||||
target_link_libraries(parameters PRIVATE flashparams tinybson)
|
target_link_libraries(parameters PRIVATE flashparams tinybson)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user