Fix for romfs generation.

This commit is contained in:
James Goppert
2015-09-19 17:57:54 -04:00
parent cd98cfe555
commit 7b6dff7cdc
4 changed files with 99 additions and 43 deletions
+10 -5
View File
@@ -5,17 +5,22 @@ px4_nuttx_generate_builtin_commands(
${config_extra_builtin_cmds}
)
px4_nuttx_generate_romfs(OUT romfs.o
ROOT ROMFS/px4fmu_common)
px4_nuttx_add_romfs(OUT romfs
ROOT ROMFS/px4fmu_common
EXTRAS ${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}_${LABEL}.bin
)
add_dependencies(romfs fw_io)
# add executable
add_executable(firmware_nuttx
builtin_commands.c
romfs.o)
builtin_commands.c)
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${BOARD}/NuttX/nuttx-export)
set(link_libs
apps nuttx m gcc
romfs apps nuttx m gcc
)
if(NOT ${BOARD} STREQUAL "sim")
+5 -1
View File
@@ -129,8 +129,12 @@ target_link_libraries(${fw_io_name}
${config_io_extra_libs}
-Wl,--end-group)
px4_nuttx_create_bin(OUT ${fw_io_name}.bin
px4_nuttx_create_bin(OUT ${CMAKE_CURRENT_BINARY_DIR}/${fw_io_name}.bin
EXE ${fw_io_name}
)
add_custom_target(fw_io
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fw_io_name}.bin)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :