Rebase changes on upstream master

This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

src/firmware/posix/CMakeLists.txt

@@ -1,17 +1,20 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-
 px4_posix_generate_builtin_commands(
 	OUT apps.h
 	MODULE_LIST ${module_libraries})
 
-add_executable(mainapp
-	${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
-	apps.h
-	)
+if ("${BOARD}" STREQUAL "eagle")
+	FASTRPC_STUB_GEN(../qurt/px4muorb.idl)
 
-if (NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT APPLE)
-	target_link_libraries(mainapp
+	QURT_APP(
+		APP_NAME mainapp
+		IDL_NAME px4muorb
+		APPS_DEST "/home/linaro"
+		SOURCES
+		${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
+		apps.h
+		LINK_LIBS
 		-Wl,--start-group
 		${module_libraries}
 		df_driver_framework
@@ -20,10 +23,27 @@ if (NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT APPLE)
 		-Wl,--end-group
 		)
 else()
-	target_link_libraries(mainapp
-		${module_libraries}
-		pthread m
+	add_executable(mainapp
+		${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
+		apps.h
 		)
+	if (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT APPLE)
+		target_link_libraries(mainapp
+			-Wl,--start-group
+			${module_libraries}
+			df_driver_framework
+			${df_driver_libraries}
+			pthread m rt
+			-Wl,--end-group
+			)
+	else()
+		target_link_libraries(mainapp
+			${module_libraries}
+			df_driver_framework
+			${df_driver_libraries}
+			pthread m
+			)
+	endif()
 endif()
 
 add_custom_target(run_config

src/firmware/qurt/CMakeLists.txt

@@ -6,6 +6,8 @@ px4_qurt_generate_builtin_commands(
 	OUT ${CMAKE_BINARY_DIR}/apps.h
 	MODULE_LIST ${module_libraries})
 
+FASTRPC_STUB_GEN(px4muorb.idl)
+
 # Enable build without HexagonSDK to check link dependencies
 if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
 	add_definitions(-DQURT_EXE_BUILD)
@@ -13,12 +15,17 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
 		${CMAKE_SOURCE_DIR}/src/platforms/qurt/dspal/dspal_stub.c
 		${CMAKE_BINARY_DIR}/apps.h)
 else()
-	QURT_BUNDLE(APP_NAME
-		mainapp
-		DSP_SOURCES
+
+	message("module_libraries = ${module_libraries}")
+	message("target_libraries = ${target_libraries}")
+	# Generate the DSP lib and stubs but not the apps side executable
+	# The Apps side executable is generated via the posix_eagle_xxxx target
+	QURT_LIB(APP_NAME mainapp
+		IDL_NAME px4muorb
+		SOURCES
 		${CMAKE_SOURCE_DIR}/src/platforms/qurt/dspal/dspal_stub.c
 		${CMAKE_BINARY_DIR}/apps.h
-		DSP_LINK_LIBS
+		LINK_LIBS
 		${module_libraries}
 		${target_libraries}
 		df_driver_framework

src/firmware/qurt/mainapp.idl

@@ -1,41 +0,0 @@
-/****************************************************************************
- *   Copyright (c) 2015 Mark Charlebois. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name ATLFlight nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-#ifndef MAINAPP_IDL
-#define MAINAPP_IDL
-
-#include "AEEStdDef.idl"
-
-interface mainapp{
-    uint32 test();
-};
-
-#endif /*MAINAPP_IDL*/