NuttX upgrade cmake wrapper (#7873)

* NuttX cmake

* px4_macros:Pass the stringified predicate as second arg to static assert

   CC_ASSERT mapes to the c++ static_assert or provides the same
   funtionality for c via the other macros. The c++ static assert
   takes 2 argumants the prdicate and a message. This fixes the
   lacking second argument.

* Updated nuttx and apps submodule to upstream nuttx 7.21+==master

   This is the latest uptake of upstream nuttx and apps.

* ROMFS generate with xxd instead of objcopy

* delete nuttx-patches

* NuttX update submodules to latest px4_nuttx-master

* fix nuttx apps and board dependency

* docker_run update to latest container 2017-08-29

* cmake ROMFS portable sed usage

* NuttX update submodules to latest px4_nuttx-master

src/modules/px4iofirmware/CMakeLists.txt

@@ -31,112 +31,19 @@
 #
 ############################################################################
 
-# kill all flags above us, this is a different board (io)
-set_directory_properties(PROPERTIES
-	INCLUDE_DIRECTORIES ""
-	LINK_DIRECTORIES ""
-	COMPILE_DEFINITIONS ""
-	)
-set(c_flags)
-set(exe_linker_flags)
-set(cxx_flags)
-set(optimization_flags)
-set(include_dirs)
-set(link_dirs)
-set(definitions)
-
-px4_nuttx_configure(HWCLASS m3 CONFIG nsh)
-
-px4_os_prebuild_targets(OUT io_prebuild_targets
-	BOARD ${config_io_board}
-	THREADS ${THREADS})
-
-px4_os_add_flags(
-	BOARD ${config_io_board}
-	C_FLAGS c_flags
-	CXX_FLAGS cxx_flags
-	OPTIMIZATION_FLAGS optimization_flags
-	EXE_LINKER_FLAGS exe_linker_flags
-	INCLUDE_DIRS include_dirs
-	LINK_DIRS link_dirs
-	DEFINITIONS definitions)
-
-px4_join(OUT CMAKE_EXE_LINKER_FLAGS LIST "${exe_linker_flags}" GLUE " ")
-px4_join(OUT CMAKE_C_FLAGS LIST "${c_flags};${optimization_flags}" GLUE " ")
-px4_join(OUT CMAKE_CXX_FLAGS LIST "${cxx_flags};${optimization_flags}" GLUE " ")
-
-include_directories(
-	${include_dirs}
-	${PX4_BINARY_DIR}/src/modules/systemlib/mixer
-	)
-link_directories(${link_dirs})
-add_definitions(${definitions})
-
-set(srcs
-	${PX4_SOURCE_DIR}/src/drivers/boards/${config_io_board}/px4io_init.c
-	${PX4_SOURCE_DIR}/src/drivers/boards/${config_io_board}/px4io_timer_config.c
-	${PX4_SOURCE_DIR}/src/drivers/stm32/drv_hrt.c
-	${PX4_SOURCE_DIR}/src/drivers/stm32/drv_io_timer.c
-	${PX4_SOURCE_DIR}/src/drivers/stm32/drv_pwm_servo.c
-	${PX4_SOURCE_DIR}/src/lib/rc/dsm.cpp
-	${PX4_SOURCE_DIR}/src/lib/rc/sbus.cpp
-	${PX4_SOURCE_DIR}/src/lib/rc/st24.cpp
-	${PX4_SOURCE_DIR}/src/lib/rc/sumd.cpp
-	${PX4_SOURCE_DIR}/src/lib/rc/common_rc.cpp
-	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer.cpp
-	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer_group.cpp
-	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer_helicopter.cpp
-	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer_multirotor.cpp
-	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer_simple.cpp
-	${PX4_SOURCE_DIR}/src/modules/systemlib/perf_counter.c
-	${PX4_SOURCE_DIR}/src/modules/systemlib/pwm_limit/pwm_limit.c
-	adc.c
-	controls.c
-	mixer.cpp
-	px4io.c
-	registers.c
-	safety.c
-	)
-
-if(${config_io_board} STREQUAL "px4io-v2")
-	list(APPEND srcs
+px4_add_module(
+	MODULE modules__px4iofirmware
+	SRCS
+		../systemlib/hx_stream.c
+		../systemlib/perf_counter.c
+		../systemlib/pwm_limit/pwm_limit.c
+		adc.c
+		controls.c
+		mixer.cpp
+		px4io.c
+		registers.c
+		safety.c
 		serial.c
-		${PX4_SOURCE_DIR}/src/modules/systemlib/hx_stream.c
-		)
-endif()
-
-set(fw_io_name ${config_io_board})
-
-add_executable(${fw_io_name} ${srcs})
-
-add_dependencies(${fw_io_name}
-	io_prebuild_targets
-	mixer_gen
-	msg_gen
-	nuttx_export_${config_io_board}
+	DEPENDS
+		platforms__common
 	)
-
-set(nuttx_export_dir ${PX4_BINARY_DIR}/${config_io_board}/NuttX/nuttx/nuttx-export)
-set(main_link_flags
-	"-T${nuttx_export_dir}/build/ld.script"
-	"-Wl,-Map=${PX4_BINARY_DIR}/${config_io_board}/main.map"
-	)
-px4_join(OUT main_link_flags LIST ${main_link_flags} GLUE " ")
-set_target_properties(${fw_io_name} PROPERTIES LINK_FLAGS ${main_link_flags})
-
-target_link_libraries(${fw_io_name}
-	-Wl,--start-group
-	apps nuttx nosys m gcc
-	${config_io_extra_libs}
-	-Wl,--end-group
-	)
-
-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 :