Merged master into driver_framework

This commit is contained in:
Lorenz Meier
2015-12-01 12:34:02 +01:00
109 changed files with 5346 additions and 359 deletions

View File

@@ -41,13 +41,17 @@ add_custom_target(check_weak
if(NOT ${BOARD} STREQUAL "sim")
if (config_io_board)
set(extras "${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}.bin")
endif()
px4_nuttx_add_romfs(OUT romfs
ROOT ROMFS/px4fmu_common
EXTRAS ${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}.bin
EXTRAS ${extras}
)
add_dependencies(romfs fw_io)
if (config_io_board)
add_dependencies(romfs fw_io)
endif()
set(fw_file
${CMAKE_CURRENT_BINARY_DIR}/${OS}-${BOARD}-${LABEL}.px4)