Use DriverFramework as a PX4 module (#4415)

* Use DriverFramework as a PX4 module

Targets wanting to use DriverFramework must add

   lib/DriverFramework/framework

to their config file.

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

* Removed spurious code

No need to add if check before for loop

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

* Added DriverFramework to NuttX configs

Added lib/DriverFramework/firmware to nuttx configs

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

* Updated src/lib/DriverFramework

* Removed DF_TARGET and __DF_${OS} defines

These are now handled inside DriverFramework

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

* Updated DriverFramework

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

* Restored __DF_${OS}

The include files in DriverFramwork need to know the target OS.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-05-03 01:03:28 -07:00
committed by Lorenz Meier
parent 23a9af9088
commit 8cb8987bcd
33 changed files with 40 additions and 34 deletions
+2 -1
View File
@@ -13,7 +13,7 @@ add_executable(firmware_nuttx
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${BOARD}/NuttX/nuttx-export)
set(link_libs
romfs apps nuttx m gcc df_driver_framework
romfs apps nuttx m gcc
)
if(NOT ${BOARD} STREQUAL "sim")
@@ -29,6 +29,7 @@ endif()
target_link_libraries(firmware_nuttx
-Wl,--start-group
${module_libraries}
${df_driver_libs}
${config_extra_libs}
${link_libs}
-Wl,--end-group)
+9 -12
View File
@@ -17,17 +17,16 @@ if ("${BOARD}" STREQUAL "eagle")
IDL_NAME px4muorb
APPS_DEST "/home/linaro"
SOURCES
px4muorb_stub.c
${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
apps.h
px4muorb_stub.c
${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
apps.h
LINK_LIBS
-Wl,--start-group
${module_libraries}
df_driver_framework
${df_driver_libs}
${FASTRPC_ARM_LIBS}
pthread m rt
-Wl,--end-group
-Wl,--start-group
${module_libraries}
${df_driver_libs}
${FASTRPC_ARM_LIBS}
pthread m rt
-Wl,--end-group
)
px4_add_adb_push(OUT upload
@@ -47,7 +46,6 @@ else()
target_link_libraries(mainapp
-Wl,--start-group
${module_libraries}
df_driver_framework
${df_driver_libs}
pthread m rt
-Wl,--end-group
@@ -55,7 +53,6 @@ else()
else()
target_link_libraries(mainapp
${module_libraries}
df_driver_framework
${df_driver_libs}
pthread m
)
-2
View File
@@ -27,7 +27,6 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
-Wl,--start-group
${module_libraries}
${target_libraries}
df_driver_framework
${df_driver_libs}
-Wl,--end-group
)
@@ -44,7 +43,6 @@ else()
LINK_LIBS
${module_libraries}
${target_libraries}
df_driver_framework
${df_driver_libs}
m
)