fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 08:21:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2973 from jgoppert/cmake-fmuv1-fix

Browse Source 
Removed uavcan from nuttx firmware for v1.
This commit is contained in:
Lorenz Meier
2015-10-12 08:30:24 +02:00
parent 67087c6428 4ad82644fe
commit c8cb13e904
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_px4fmu-v1_default.cmake
-1
View File
@@ -98,7 +98,6 @@ set(config_module_list
modules/controllib modules/controllib
modules/uORB modules/uORB
modules/dataman modules/dataman
modules/uavcan
# #
# Libraries # Libraries
cmake/configs/nuttx_px4fmu-v2_default.cmake
+2
View File
@@ -168,6 +168,8 @@ set(config_io_board
set(config_extra_libs set(config_extra_libs
${CMAKE_SOURCE_DIR}/src/lib/mathlib/CMSIS/libarm_cortexM4lf_math.a ${CMAKE_SOURCE_DIR}/src/lib/mathlib/CMSIS/libarm_cortexM4lf_math.a
libuavcan.a
libuavcan_stm32_driver.a
) )
set(config_io_extra_libs set(config_io_extra_libs
src/firmware/nuttx/CMakeLists.txt
-2
View File
@@ -40,8 +40,6 @@ target_link_libraries(firmware_nuttx
${module_libraries} ${module_libraries}
${config_extra_libs} ${config_extra_libs}
${link_libs} ${link_libs}
libuavcan_stm32_driver.a
libuavcan.a
-Wl,--end-group) -Wl,--end-group)
add_custom_target(check_weak add_custom_target(check_weak