Merge branch 'master' of github.com:PX4/Firmware into ram_cleanup

2015-10-12 08:30:39 +02:00 · 2015-10-12 08:30:39 +02:00 · 414a5366c0
parent a60277e9ba c8cb13e904
commit 414a5366c0
2 changed files with 2 additions and 2 deletions
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@ -168,6 +168,8 @@ set(config_io_board

 set(config_extra_libs
 	${CMAKE_SOURCE_DIR}/src/lib/mathlib/CMSIS/libarm_cortexM4lf_math.a
+	libuavcan.a
+	libuavcan_stm32_driver.a
 	)

 set(config_io_extra_libs
--- a/src/firmware/nuttx/CMakeLists.txt
+++ b/src/firmware/nuttx/CMakeLists.txt
@ -40,8 +40,6 @@ target_link_libraries(firmware_nuttx
 	${module_libraries}
 	${config_extra_libs}
 	${link_libs}
-	libuavcan_stm32_driver.a
-	libuavcan.a
 	-Wl,--end-group)

 add_custom_target(check_weak