boards organization

ROMFS/CMakeLists.txt

@@ -87,13 +87,13 @@ add_custom_command(OUTPUT ${romfs_gen_root_dir}/init.d/rcS ${romfs_gen_root_dir}
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
 		--airframes-path ${romfs_gen_root_dir}/init.d
 		--start-script ${romfs_gen_root_dir}/init.d/rc.autostart
-		--board ${BOARD}
+		--board ${PX4_BOARD}
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/serial/generate_config.py
 		--rc-dir ${romfs_gen_root_dir}/init.d
 		--serial-ports ${board_serial_ports} ${added_arguments}
 		--config-files ${module_config_files} #--verbose
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_romfs_pruner.py
-		--folder ${romfs_gen_root_dir} --board ${BOARD}
+		--folder ${romfs_gen_root_dir} --board ${PX4_BOARD}
 	DEPENDS
 		${jinja_templates}
 		${module_config_files}
@@ -107,15 +107,17 @@ add_custom_command(OUTPUT ${romfs_gen_root_dir}/init.d/rcS ${romfs_gen_root_dir}
 
 # copy extras into ROMFS
 set(extras_dependencies)
+
 # copy px4io binary if configured
-if (config_io_board)
+if(config_io_board)
 	list(APPEND extras_dependencies
 		copy_px4io_bin
 		${fw_io_bin}
 		)
 endif()
 
-if (config_bl_file)
+
+if(config_bl_file)
 	file(MAKE_DIRECTORY ${PX4_BINARY_DIR}/romfs_extras)
 	configure_file(${config_bl_file} ${PX4_BINARY_DIR}/romfs_extras COPYONLY)
 

ROMFS/px4fmu_common/init.d/rcS

@@ -71,7 +71,7 @@ set FEXTRAS /fs/microsd/etc/extras.txt
 set FRC /fs/microsd/etc/rc.txt
 set FMU_ARGS ""
 set FMU_MODE pwm
-set IOFW "/etc/extras/px4io-v2.bin"
+set IOFW "/etc/extras/px4io-v2_default.bin"
 set IO_PRESENT no
 set LOG_FILE /fs/microsd/bootlog.txt
 set MAV_TYPE none
@@ -367,7 +367,7 @@ else
 
 	#
 	# Check if PX4IO present and update firmware if needed.
-	# Assumption IOFW set to firware file and IO_PRESENT = no
+	# Assumption IOFW set to firmware file and IO_PRESENT = no
 	#
 
 	if [ -f $IOFW ]