cmake consolidate px4 executable builds and upload

platforms/qurt/CMakeLists.txt

@@ -1,5 +1,4 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
-include(common/px4_upload)
 include(toolchain/Toolchain-qurt)
 include(fastrpc)
 include(qurt_lib)
@@ -26,14 +25,16 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
                 ${CMAKE_CURRENT_BINARY_DIR}
                 ${FASTRPC_DSP_INCLUDES}
                 )
+
 	add_executable(px4
 		${PX4_BINARY_DIR}/src/firmware/qurt/px4muorb_skel.c
-		${PX4_BINARY_DIR}/apps.cpp)
+		${PX4_BINARY_DIR}/apps.cpp
+		)
 
 	target_link_libraries(px4
 		-Wl,--start-group
-		${module_libraries}
-		${df_driver_libs}
+			${module_libraries}
+			${df_driver_libs}
 		-Wl,--end-group
 		)
 else()
@@ -49,14 +50,14 @@ else()
 			m
 		)
 
-	px4_add_adb_push(OUT upload
-			 OS ${OS}
-			 BOARD ${BOARD}
-			 FILES ${CMAKE_CURRENT_BINARY_DIR}/libpx4.so
-				 ${CMAKE_CURRENT_BINARY_DIR}/libpx4muorb_skel.so
-				 ${PX4_SOURCE_DIR}/posix-configs/eagle/flight/px4.config
-			 DEPENDS px4 px4muorb_skel
-			 DEST /usr/share/data/adsp)
+	add_custom_target(upload
+		COMMAND
+			${PX4_SOURCE_DIR}/Tools/adb_upload.sh
+				${CMAKE_CURRENT_BINARY_DIR}/libpx4.so ${CMAKE_CURRENT_BINARY_DIR}/libpx4muorb_skel.so ${PX4_SOURCE_DIR}/posix-configs/eagle/flight/px4.config
+				/usr/share/data/adsp
+		DEPENDS px4 px4muorb_skel
+		COMMENT "uploading px4"
+		USES_TERMINAL
+		)
+			 
 endif()
-
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :