cmake remove circular linking and reorganize

- px4_add_module now requires MAIN
 - px4_add_library doesn't automatically link

cmake/common/px4_base.cmake

@@ -195,10 +195,22 @@ function(px4_add_module)
 		ONE_VALUE MODULE MAIN STACK STACK_MAIN STACK_MAX PRIORITY
 		MULTI_VALUE COMPILE_FLAGS LINK_FLAGS SRCS INCLUDES DEPENDS
 		OPTIONS EXTERNAL
-		REQUIRED MODULE
+		REQUIRED MODULE MAIN
 		ARGN ${ARGN})
 
-	px4_add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${SRCS})
+	add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${SRCS})
+
+	# all modules can potentially use parameters and uORB
+	add_dependencies(${MODULE} uorb_headers)
+	target_link_libraries(${MODULE} PRIVATE prebuild_targets parameters_interface platforms__common px4_layer systemlib)
+
+	set_property(GLOBAL APPEND PROPERTY PX4_MODULE_LIBRARIES ${MODULE})
+	set_property(GLOBAL APPEND PROPERTY PX4_MODULE_PATHS ${CMAKE_CURRENT_SOURCE_DIR})
+
+	px4_add_optimization_flags_for_target(${MODULE})
+
+	# Pass variable to the parent px4_add_module.
+	set(_no_optimization_for_target ${_no_optimization_for_target} PARENT_SCOPE)
 
 	# set defaults if not set
 	set(MAIN_DEFAULT MAIN-NOTFOUND)
@@ -240,7 +252,16 @@ function(px4_add_module)
 	endif()
 
 	if(DEPENDS)
-		add_dependencies(${MODULE} ${DEPENDS})
+		# using target_link_libraries for dependencies provides linking
+		#  as well as interface include and libraries
+		foreach(dep ${DEPENDS})
+			get_target_property(dep_type ${dep} TYPE)
+			if (${dep_type} STREQUAL "STATIC_LIBRARY")
+				target_link_libraries(${MODULE} PRIVATE ${dep})
+			else()
+				add_dependencies(${MODULE} ${dep})
+			endif()
+		endforeach()
 	endif()
 
 	# join list variables to get ready to send to compiler
@@ -425,6 +446,10 @@ function(px4_add_common_flags)
 				-fdiagnostics-color=always
 			)
 		endif()
+
+		list(APPEND cxx_warnings
+			-Wno-format-truncation # TODO: fix
+		)
 	endif()
 
 	set(visibility_flags
@@ -450,10 +475,13 @@ function(px4_add_common_flags)
 		${_optimization_flags}
 		)
 
-	set(added_include_dirs
+	include_directories(
 		${PX4_BINARY_DIR}
 		${PX4_BINARY_DIR}/src
+		${PX4_BINARY_DIR}/src/lib
 		${PX4_BINARY_DIR}/src/modules
+
+
 		${PX4_SOURCE_DIR}/src
 		${PX4_SOURCE_DIR}/src/drivers/boards/${BOARD}
 		${PX4_SOURCE_DIR}/src/include
@@ -464,13 +492,10 @@ function(px4_add_common_flags)
 		${PX4_SOURCE_DIR}/src/platforms
 		)
 
-	set(added_link_dirs) # none used currently
-	set(added_exe_linker_flags)
-
 	string(TOUPPER ${BOARD} board_upper)
 	string(REPLACE "-" "_" board_config ${board_upper})
 
-	set(added_definitions
+	add_definitions(
 		-DCONFIG_ARCH_BOARD_${board_config}
 		-D__STDC_FORMAT_MACROS
 		)
@@ -548,13 +573,25 @@ endfunction()
 #
 function(px4_add_library target)
 	add_library(${target} ${ARGN})
-	add_dependencies(${target} prebuild_targets)
+
+	target_compile_definitions(${target} PRIVATE MODULE_NAME="${target}")
+
+	# all PX4 libraries have access to parameters and uORB
+	add_dependencies(${target} uorb_headers)
+	target_link_libraries(${target} PRIVATE prebuild_targets parameters_interface uorb_msgs)
+
+	# TODO: move to platform layer
+	if ("${OS}" MATCHES "nuttx")
+		target_link_libraries(${target} PRIVATE m nuttx_c)
+	endif()
+
 	px4_add_optimization_flags_for_target(${target})
 
 	# Pass variable to the parent px4_add_module.
 	set(_no_optimization_for_target ${_no_optimization_for_target} PARENT_SCOPE)
 
 	set_property(GLOBAL APPEND PROPERTY PX4_LIBRARIES ${target})
+	set_property(GLOBAL APPEND PROPERTY PX4_MODULE_PATHS ${CMAKE_CURRENT_SOURCE_DIR})
 endfunction()
 
 #=============================================================================
@@ -596,4 +633,3 @@ function(px4_find_python_module module)
 	#endif()
 endfunction(px4_find_python_module)
 
-# vim: set noet fenc=utf-8 ff=unix nowrap:

cmake/configs/nuttx_aerocore2_default.cmake

@@ -13,18 +13,14 @@ set(config_module_list
 	#drivers/magnetometer
 	#drivers/telemetry
 
-	drivers/device
 	drivers/stm32
 	drivers/stm32/adc
 	drivers/stm32/tone_alarm
-	drivers/led
 	drivers/px4fmu
-	drivers/boards
 	drivers/imu/lsm303d
 	drivers/imu/l3gd20
 	drivers/gps
 	drivers/pwm_out_sim
-	drivers/airspeed
 	modules/sensors
 	#drivers/pwm_input
 	#drivers/camera_trigger
@@ -100,27 +96,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_aerofc-v1_default.cmake

@@ -8,11 +8,8 @@ set(config_module_list
 	# Board support modules
 	#
 	drivers/aerofc_adc
-	drivers/boards
-	drivers/device
 	drivers/distance_sensor
 	drivers/gps
-	drivers/led
 	drivers/barometer/ms5611
 	drivers/magnetometer/hmc5883
 	drivers/magnetometer/ist8310
@@ -70,21 +67,5 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/version
-	lib/FlightTasks
 )

cmake/configs/nuttx_auav-x21_default.cmake

@@ -13,14 +13,10 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/airspeed
 	drivers/batt_smbus
 	drivers/blinkm
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
-	drivers/led
 	drivers/mkblctrl
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
@@ -113,26 +109,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_crazyflie_default.cmake

@@ -5,11 +5,8 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	drivers/stm32
-	drivers/led
 	drivers/px4fmu
-	drivers/boards
 	drivers/imu/mpu9250
 	drivers/barometer/lps25h
 	drivers/gps
@@ -71,25 +68,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_esc35-v1_default.cmake

@@ -39,9 +39,6 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/boards
-	drivers/device
-	drivers/led
 	drivers/stm32
 
 	#
@@ -63,12 +60,4 @@ set(config_module_list
 	modules/uavcanesc/commands/dc
 	modules/uavcanesc/commands/rpm
 	modules/uavcanesc/commands/stat
-
-	#
-	# Library modules
-	#
-	lib/version
-	modules/systemlib
-	modules/systemlib/param
-	modules/uORB
 )

cmake/configs/nuttx_mindpx-v2_default.cmake

@@ -13,16 +13,12 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/airspeed
 	drivers/batt_smbus
 	drivers/blinkm
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
 	#drivers/hott
 	drivers/imu/l3gd20
-	drivers/led
 	drivers/imu/lsm303d
 	#drivers/mkblctrl
 	drivers/imu/mpu6000
@@ -117,27 +113,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_nxphlite-v3_default.cmake

@@ -13,13 +13,10 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/airspeed
 	drivers/barometer/mpl3115a2
 	drivers/batt_smbus
 	drivers/blinkm
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/imu/fxas21002c
 	drivers/imu/fxos8701cq
 	drivers/gps
@@ -27,7 +24,6 @@ set(config_module_list
 	drivers/kinetis/adc
 	drivers/kinetis/tone_alarm
 	drivers/imu/l3gd20
-	drivers/led
 	drivers/mkblctrl
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
@@ -121,27 +117,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/ecl
-	lib/conversion
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/DriverFramework/framework
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_px4-same70xplained-v1_default.cmake

@@ -13,13 +13,10 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/device
 	drivers/samv7
 #WIP 	drivers/samv7/adc
 	drivers/samv7/tone_alarm
-	drivers/led
 	drivers/px4fmu
-	drivers/boards
 	drivers/rgbled
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
@@ -28,7 +25,6 @@ set(config_module_list
 	drivers/gps
 #WIP 	drivers/pwm_out_sim
 	drivers/blinkm
-	drivers/airspeed
 	modules/sensors
 	#drivers/mkblctrl
 	drivers/px4flow
@@ -94,26 +90,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_px4-stm32f4discovery_default.cmake

@@ -5,10 +5,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	drivers/stm32
-	drivers/led
-	drivers/boards
 
 	#
 	# System commands
@@ -23,25 +20,6 @@ set(config_module_list
 	systemcmds/nshterm
 	systemcmds/ver
 
-	#
-	# Library modules
-	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	#lib/mathlib/CMSIS
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/mathlib
-	lib/mixer
-	lib/version
-
 	#
 	# Demo apps
 	#

cmake/configs/nuttx_px4cannode-v1_default.cmake

@@ -37,10 +37,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/boards
 	drivers/bootloaders
-	drivers/device
-	drivers/led
 	drivers/stm32
 
 	#
@@ -56,12 +53,4 @@ set(config_module_list
 	#
 	modules/uavcannode
 
-	#
-	# Library modules
-	#
-	lib/version
-	modules/systemlib
-	modules/systemlib/param
-	modules/uORB
-
 )

cmake/configs/nuttx_px4esc-v1_default.cmake

@@ -39,10 +39,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/boards
 	drivers/bootloaders
-	drivers/device
-	drivers/led
 	drivers/stm32
 
 	#
@@ -65,12 +62,4 @@ set(config_module_list
 	modules/uavcanesc/commands/rpm
 	modules/uavcanesc/commands/stat
 
-	#
-	# Library modules
-	#
-	lib/version
-	modules/systemlib
-	modules/systemlib/param
-	modules/uORB
-
 )

cmake/configs/nuttx_px4fmu-v2_default.cmake

@@ -12,22 +12,18 @@ set(config_module_list
 	#drivers/telemetry
 
 	#drivers/imu/adis16448
-	drivers/airspeed
 	drivers/barometer/ms5611
 	#drivers/blinkm
 	#drivers/imu/bmi160
 	#drivers/barometer/bmp280
-	drivers/boards
 	#drivers/bst
 	drivers/camera_trigger
-	drivers/device
 	#drivers/frsky_telemetry
 	drivers/gps
 	#drivers/hott
 	#drivers/iridiumsbd
 	#drivers/irlock
 	drivers/imu/l3gd20
-	drivers/led
 	drivers/imu/lsm303d
 	drivers/magnetometer/hmc5883
 	drivers/magnetometer/lis3mdl
@@ -142,24 +138,6 @@ set(config_module_list
 	# Library modules
 	#
 	modules/dataman
-	modules/systemlib
-	modules/systemlib/param
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	#lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 
 	#
 	# OBC challenge

cmake/configs/nuttx_px4fmu-v2_test.cmake

@@ -12,22 +12,18 @@ set(config_module_list
 	#drivers/telemetry
 
 	#drivers/imu/adis16448
-	drivers/airspeed
 	drivers/barometer/ms5611
 	#drivers/blinkm
 	#drivers/imu/bmi160
 	#drivers/barometer/bmp280
-	drivers/boards
 	#drivers/bst
 	#drivers/camera_trigger
-	drivers/device
 	#drivers/frsky_telemetry
 	drivers/gps
 	#drivers/hott
 	#drivers/iridiumsbd
 	#drivers/irlock
 	drivers/imu/l3gd20
-	drivers/led
 	drivers/imu/lsm303d
 	drivers/magnetometer/hmc5883
 	drivers/magnetometer/lis3mdl
@@ -133,24 +129,6 @@ set(config_module_list
 	# Library modules
 	#
 	modules/dataman
-	modules/systemlib
-	modules/systemlib/param
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	#lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 
 	#
 	# OBC challenge

cmake/configs/nuttx_px4fmu-v3_default.cmake

@@ -19,12 +19,9 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/airspeed
 	drivers/batt_smbus
 	drivers/blinkm
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
 	drivers/imu/adis16448
 	drivers/imu/bmi160
@@ -33,7 +30,6 @@ set(config_module_list
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
 	drivers/irlock
-	drivers/led
 	drivers/mkblctrl
 	drivers/oreoled
 	drivers/protocol_splitter
@@ -131,24 +127,6 @@ set(config_module_list
 	# Library modules
 	#
 	modules/dataman
-	modules/systemlib
-	modules/systemlib/param
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 
 	#
 	# OBC challenge

cmake/configs/nuttx_px4fmu-v4_default.cmake

@@ -14,15 +14,11 @@ set(config_module_list
 	drivers/telemetry
 	drivers/imu
 
-	drivers/airspeed
 	drivers/batt_smbus
 	drivers/blinkm
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
 	drivers/irlock
-	drivers/led
 	drivers/mkblctrl
 	drivers/oreoled
 	drivers/pca9685
@@ -117,27 +113,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_px4fmu-v4pro_default.cmake

@@ -13,18 +13,14 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/airspeed
 	drivers/batt_smbus
 	drivers/blinkm
 	drivers/imu/bma180
 	drivers/imu/bmi160
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
 	drivers/irlock
 	drivers/imu/l3gd20
-	drivers/led
 	drivers/mkblctrl
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
@@ -122,24 +118,6 @@ set(config_module_list
 	# Library modules
 	#
 	modules/dataman
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 
 	#
 	# OBC challenge

cmake/configs/nuttx_px4fmu-v5_default.cmake

@@ -13,18 +13,14 @@ set(config_module_list
 	drivers/magnetometer
 	drivers/telemetry
 
-	drivers/airspeed
 	drivers/batt_smbus
 	drivers/blinkm
 	drivers/imu/bma180
 	drivers/imu/bmi055
 	drivers/imu/bmi160
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
 	drivers/irlock
-	drivers/led
 	drivers/mkblctrl
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
@@ -123,25 +119,6 @@ set(config_module_list
 	# Library modules
 	#
 	modules/dataman
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 
 	#
 	# OBC challenge

cmake/configs/nuttx_px4io-v2_default.cmake

@@ -2,9 +2,6 @@
 px4_nuttx_configure(HWCLASS m3 CONFIG nsh)
 
 set(config_module_list
-	drivers/boards/px4io-v2
 	drivers/stm32
-	lib/mixer
-	lib/rc
 	modules/px4iofirmware
 )

cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake

@@ -14,15 +14,11 @@ set(config_module_list
 	drivers/telemetry
 
 	drivers/imu/adis16448
-	drivers/airspeed
 	drivers/blinkm
 	drivers/imu/bma180
 	drivers/imu/bmi160
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
-	drivers/led
 	drivers/mkblctrl
 	drivers/imu/mpu6000
 	drivers/imu/mpu9250
@@ -100,27 +96,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/nuttx_s2740vc-v1_default.cmake

@@ -6,9 +6,7 @@ add_definitions(
 
 px4_nuttx_configure(HWCLASS m4 CONFIG nsh)
 
-#
 # UAVCAN boot loadable Module ID
-
 set(uavcanblid_sw_version_major 0)
 set(uavcanblid_sw_version_minor 1)
 add_definitions(
@@ -16,9 +14,7 @@ add_definitions(
 	-DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor}
 	)
 
-#
 # Bring in common uavcan hardware identity definitions
-#
 include(common/px4_git)
 px4_add_git_submodule(TARGET git_uavcan_board_ident PATH "cmake/configs/uavcan_board_ident")
 include(configs/uavcan_board_ident/s2740vc-v1)
@@ -33,14 +29,11 @@ include(configs/uavcan_board_ident/s2740vc-v1)
 # SW_MINOR ${uavcanblid_sw_version_minor})
 
 set(config_module_list
-
 	#
 	# Board support modules
 	#
-
+	drivers/bootloaders
 	drivers/stm32
-	drivers/led
-	drivers/boards
 
 	#
 	# System commands
@@ -49,15 +42,4 @@ set(config_module_list
 	systemcmds/top
 	systemcmds/config
 	systemcmds/ver
-
-	#
-	# General system control
-	#
-
-	#
-	# Library modules
-	#
-	modules/systemlib/param
-	modules/systemlib
-	lib/version
-)
+)

cmake/configs/nuttx_tap-v1_default.cmake

@@ -7,13 +7,9 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/airspeed
-	drivers/boards
-	drivers/device
 	drivers/barometer
 	drivers/differential_pressure
 	drivers/gps
-	drivers/led
 	drivers/magnetometer/hmc5883
 	drivers/imu/mpu6000
 	drivers/px4fmu
@@ -77,24 +73,5 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 )

cmake/configs/posix_bebop_default.cmake

@@ -12,7 +12,6 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	drivers/linux_sbus
 	modules/sensors
 	platforms/posix/drivers/df_ms5607_wrapper
@@ -56,9 +55,6 @@ set(config_module_list
 	modules/sdlog2
 	modules/logger
 	modules/commander
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 	modules/land_detector
 	modules/navigator
@@ -68,19 +64,6 @@ set(config_module_list
 	# PX4 drivers
 	#
 	drivers/gps
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/version
-	lib/FlightTasks
 )
 
 set(config_df_driver_list

cmake/configs/posix_eagle_hil.cmake

@@ -18,9 +18,6 @@ else()
 endif()
 
 set(config_module_list
-	drivers/device
-	drivers/boards
-	drivers/led
 	drivers/linux_sbus
 
 	systemcmds/param
@@ -28,9 +25,6 @@ set(config_module_list
 
 	modules/mavlink
 
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/sensors
 	modules/dataman
 	modules/sdlog2
@@ -38,13 +32,6 @@ set(config_module_list
 	modules/simulator
 	modules/commander
 
-	lib/controllib
-	lib/mathlib
-	lib/ecl
-	lib/conversion
-	lib/version
-	lib/DriverFramework/framework
-
 	modules/muorb/krait
 	)
 

cmake/configs/posix_eagle_muorb.cmake

@@ -13,12 +13,6 @@ else()
 endif()
 
 set(config_module_list
-	drivers/device
-
-	modules/uORB
-
-	lib/DriverFramework/framework
-
 	modules/muorb/krait
 	)
 

cmake/configs/posix_ocpoc_cross.cmake

@@ -18,7 +18,6 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	modules/sensors
 	platforms/posix/drivers/df_mpu9250_wrapper
 	platforms/posix/drivers/df_ms5611_wrapper
@@ -59,9 +58,6 @@ set(config_module_list
 	modules/sdlog2
 	modules/logger
 	modules/commander
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 	modules/land_detector
 	modules/navigator
@@ -76,21 +72,6 @@ set(config_module_list
 	drivers/linux_pwm_out
 	drivers/rgbled
 	drivers/ulanding
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/version
-	lib/FlightTasks
 	
 	examples/px4_simple_app
 )

cmake/configs/posix_ocpoc_ubuntu.cmake

@@ -17,7 +17,6 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	drivers/distance_sensor
 	modules/sensors
 	platforms/posix/drivers/df_mpu9250_wrapper
@@ -59,9 +58,6 @@ set(config_module_list
 	modules/sdlog2
 	modules/logger
 	modules/commander
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 	modules/land_detector
 	modules/navigator
@@ -75,21 +71,6 @@ set(config_module_list
 	drivers/linux_sbus
 	drivers/linux_pwm_out
 	drivers/rgbled
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/version
-	lib/FlightTasks
 	
 	examples/px4_simple_app
 )

cmake/configs/posix_rpi_common.cmake

@@ -15,10 +15,8 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/airspeed
 	#drivers/barometer
 	drivers/batt_smbus
-	drivers/device
 	drivers/differential_pressure
 	drivers/distance_sensor
 	#drivers/telemetry
@@ -71,9 +69,6 @@ set(config_module_list
 	modules/sdlog2
 	modules/logger
 	modules/commander
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/dataman
 	modules/land_detector
 	modules/navigator
@@ -92,20 +87,6 @@ set(config_module_list
 	drivers/pwm_out_sim
 	drivers/rpi_rc_in
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 )
 
 #

cmake/configs/posix_sdflight_default.cmake

@@ -30,13 +30,10 @@ endif()
 set(CONFIG_SHMEM "1")
 
 set(config_module_list
-	drivers/device
 	drivers/blinkm
 	drivers/linux_sbus
 	drivers/pwm_out_sim
 	drivers/rgbled
-	drivers/led
-	drivers/boards
 	drivers/qshell/posix
 
 	systemcmds/param
@@ -57,9 +54,6 @@ set(config_module_list
 	modules/mc_pos_control
 	modules/mc_att_control
 
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/muorb/krait
 	modules/sensors
 	modules/dataman
@@ -68,16 +62,4 @@ set(config_module_list
 	modules/simulator
 	modules/commander
 	modules/navigator
-
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
 )

cmake/configs/posix_sdflight_legacy.cmake

@@ -22,13 +22,10 @@ set(CONFIG_SHMEM "1")
 
 
 set(config_module_list
-	drivers/device
 	drivers/blinkm
 	drivers/linux_sbus
 	drivers/pwm_out_sim
 	drivers/rgbled
-	drivers/led
-	drivers/boards
 	drivers/qshell/posix
 
 	systemcmds/param
@@ -49,9 +46,6 @@ set(config_module_list
 	modules/mc_pos_control
 	modules/mc_att_control
 
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/muorb/krait
 	modules/sensors
 	modules/dataman
@@ -60,15 +54,4 @@ set(config_module_list
 	modules/simulator
 	modules/commander
 	modules/navigator
-
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
 	)

cmake/configs/posix_sitl_default.cmake

@@ -7,24 +7,15 @@ set(config_module_list
 	drivers/distance_sensor
 	#drivers/telemetry
 
-	drivers/airspeed
 	drivers/batt_smbus
-	drivers/boards
 	drivers/camera_trigger
-	drivers/device
 	drivers/gps
 	drivers/linux_gpio
 	drivers/pwm_out_sim
 	drivers/vmount
 
 	modules/sensors
-	platforms/posix/drivers/accelsim
-	platforms/posix/drivers/adcsim
-	platforms/posix/drivers/airspeedsim
-	platforms/posix/drivers/barosim
-	platforms/posix/drivers/gpssim
-	platforms/posix/drivers/gyrosim
-	platforms/posix/drivers/ledsim
+
 	platforms/posix/drivers/tonealrmsim
 
 	#
@@ -111,27 +102,8 @@ set(config_module_list
 	# Library modules
 	#
 	modules/dataman
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/landing_target_estimator
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mixer
-	lib/mathlib
-	lib/rc
-	lib/terrain_estimation
-	lib/tunes
-	lib/version
-	lib/FlightTasks
-
 	#
 	# OBC challenge
 	#

cmake/configs/posix_sitl_replay.cmake

@@ -2,25 +2,14 @@
 set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-native.cmake)
 
 set(config_module_list
-	drivers/device
 	drivers/boards/sitl
 	systemcmds/param
 	systemcmds/ver
 	systemcmds/perf
-	modules/uORB
-	modules/systemlib/param
-	modules/systemlib
 	modules/ekf2
 	modules/ekf2_replay
 	modules/sdlog2
 	modules/logger
-	lib/controllib
-	lib/mathlib
-	lib/conversion
-	lib/ecl
-	lib/version
-	lib/DriverFramework/framework
-	lib/micro-CDR
 	)
 
 set(config_extra_builtin_cmds

cmake/configs/qurt_eagle_hello.cmake

@@ -20,7 +20,6 @@ include(qurt_flags)
 include_directories(${HEXAGON_SDK_INCLUDES})
 
 set(config_module_list
-	drivers/device
 
 	#
 	# System commands
@@ -30,8 +29,5 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	)
 

cmake/configs/qurt_eagle_hil.cmake

@@ -20,10 +20,7 @@ include(qurt_flags)
 include_directories(${HEXAGON_SDK_INCLUDES})
 
 set(config_module_list
-	drivers/device
-	drivers/boards
 	drivers/pwm_out_sim
-	drivers/led
 	drivers/rgbled
 	modules/sensors
 
@@ -52,23 +49,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/commander
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/version
-
 	#
 	# sources for muorb over fastrpc
 	#

cmake/configs/qurt_eagle_muorb.cmake

@@ -20,7 +20,6 @@ include(qurt_flags)
 include_directories(${HEXAGON_SDK_INCLUDES})
 
 set(config_module_list
-	drivers/device
 
 	#
 	# System commands
@@ -30,17 +29,6 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/mathlib
-	lib/conversion
-	lib/version
-	lib/DriverFramework/framework
 
 	#
 	# sources for muorb over fastrpc

cmake/configs/qurt_eagle_test.cmake

@@ -20,7 +20,6 @@ include(qurt_flags)
 include_directories(${HEXAGON_SDK_INCLUDES})
 
 set(config_module_list
-	drivers/device
 
 	#
 	# System commands
@@ -30,16 +29,5 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
-
-	#
-	# Libraries
-	#
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/mathlib
-	lib/mixer
 	)
 

cmake/configs/qurt_eagle_travis.cmake

@@ -25,10 +25,7 @@ include(qurt_flags)
 include_directories(${HEXAGON_SDK_INCLUDES})
 
 set(config_module_list
-	drivers/device
-	drivers/boards
 	drivers/pwm_out_sim
-	drivers/led
 	drivers/rgbled
 	modules/sensors
 
@@ -57,24 +54,8 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/commander
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/led
-	lib/mathlib
-	lib/mixer
-	lib/terrain_estimation
-	lib/version
-
 	#
 	# sources for muorb over fastrpc
 	#

cmake/configs/qurt_sdflight_default.cmake

@@ -34,7 +34,6 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	modules/sensors
 	platforms/posix/drivers/df_mpu9250_wrapper
 	platforms/posix/drivers/df_bmp280_wrapper
@@ -66,9 +65,6 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/commander
 	modules/land_detector
 
@@ -80,20 +76,6 @@ set(config_module_list
 	drivers/qshell/qurt
 	drivers/snapdragon_pwm_out
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/version
-	lib/FlightTasks
-
 	#
 	# sources for muorb over fastrpc
 	#

cmake/configs/qurt_sdflight_legacy.cmake

@@ -33,7 +33,6 @@ set(config_module_list
 	#
 	# Board support modules
 	#
-	drivers/device
 	modules/sensors
 	platforms/posix/drivers/df_mpu9250_wrapper
 	platforms/posix/drivers/df_bmp280_wrapper
@@ -61,9 +60,6 @@ set(config_module_list
 	#
 	# Library modules
 	#
-	modules/systemlib/param
-	modules/systemlib
-	modules/uORB
 	modules/commander
 	modules/land_detector
 
@@ -79,19 +75,6 @@ set(config_module_list
 	#
 	platforms/qurt/fc_addon/uart_esc
 
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/conversion
-	lib/DriverFramework/framework
-	lib/ecl
-	lib/mathlib
-	lib/mixer
-	lib/rc
-	lib/terrain_estimation
-	lib/version
-
 	#
 	# sources for muorb over fastrpc
 	#