From cc053bffcd6c9c41d5187f048c63783cbafc0f29 Mon Sep 17 00:00:00 2001
From: James Goppert <james.goppert@gmail.com>
Date: Sat, 19 Sep 2015 09:58:10 -0400
Subject: [PATCH] Added px4io bin to ROMFS.

---
 cmake/nuttx/px4_impl_nuttx.cmake         |  4 ++++
 src/modules/px4iofirmware/CMakeLists.txt | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cmake/nuttx/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake
index 8b82ed1704..466e25b017 100644
--- a/cmake/nuttx/px4_impl_nuttx.cmake
+++ b/cmake/nuttx/px4_impl_nuttx.cmake
@@ -305,6 +305,10 @@ function(px4_nuttx_generate_romfs)
 		COMMAND cmake -E remove_directory ${romfs_temp_dir}
 		COMMAND cmake -E copy_directory ${romfs_src_dir} ${romfs_temp_dir}
 		COMMAND cmake -E copy rc.autostart ${romfs_temp_dir}/init.d
+		COMMAND cmake -E make_directory ${romfs_temp_dir}/extras
+		COMMAND cmake -E copy
+			${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}_${LABEL}.bin
+			${romfs_temp_dir}/extras
 		#TODO add romfs cleanup of temp file .~, .swp etc
 		COMMAND ${PYTHON_EXECUTABLE} ${romfs_pruner}
 			--folder ${romfs_temp_dir}
diff --git a/src/modules/px4iofirmware/CMakeLists.txt b/src/modules/px4iofirmware/CMakeLists.txt
index d5183bb04e..b7251b4a08 100644
--- a/src/modules/px4iofirmware/CMakeLists.txt
+++ b/src/modules/px4iofirmware/CMakeLists.txt
@@ -103,10 +103,12 @@ elseif(${config_io_board} STREQUAL "px4io-v2")
 		)
 endif()
 
-add_executable(firmware_io_nuttx
+set(fw_io_name ${config_io_board}_${LABEL})
+
+add_executable(${fw_io_name}
 	${srcs})
 
-add_dependencies(firmware_io_nuttx
+add_dependencies(${fw_io_name}
 	nuttx_export_${config_io_board}
 	msg_gen
 	io_prebuild_targets
@@ -119,11 +121,11 @@ set(main_link_flags
 	"-Wl,-Map=${CMAKE_BINARY_DIR}/${config_io_board}/main.map"
 	)
 px4_join(OUT main_link_flags LIST ${main_link_flags} GLUE " ")
-set_target_properties(firmware_io_nuttx PROPERTIES LINK_FLAGS ${main_link_flags})
+set_target_properties(${fw_io_name} PROPERTIES LINK_FLAGS ${main_link_flags})
 
 set(io_fw_file ${CMAKE_CURRENT_BINARY_DIR}/${config_io_board}.px4)
 
-target_link_libraries(firmware_io_nuttx
+target_link_libraries(${fw_io_name}
 	-Wl,--start-group
 	apps nuttx nosys m gcc
 	${config_io_extra_libs}
@@ -131,7 +133,7 @@ target_link_libraries(firmware_io_nuttx
 
 px4_nuttx_add_firmware(OUT ${io_fw_file}
 	BOARD ${config_io_board}
-	EXE ${CMAKE_CURRENT_BINARY_DIR}/firmware_io_nuttx
+	EXE ${CMAKE_CURRENT_BINARY_DIR}/${fw_io_name}
 	${config_firmware_options}
 	)