diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake
index d53fb224e2ced0bbd7ab34e1d6e6b828c215a96a..cb32cc24648254eb92e5249bbec57c2771032257 100644
--- a/boards/auav/x21/default.cmake
+++ b/boards/auav/x21/default.cmake
@@ -18,6 +18,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake
index 19166f09eb1eb68637cf2cfe4cf14130de1f3e79..c908147807137025bb123f2ce08291d779c0ee82 100644
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -23,6 +23,7 @@ px4_add_board(
 		#barometer # all available barometer drivers
 		barometer/ms5611
 		#batt_smbus
+		#camera_capture
 		#camera_trigger
 		#differential_pressure # all available differential pressure drivers
 		differential_pressure/ms4525
diff --git a/boards/px4/fmu-v2/fixedwing.cmake b/boards/px4/fmu-v2/fixedwing.cmake
index 162f82d955be47c8c64bd889ada0ca77c69eb6fc..a4dea2c9c22ed10d09cf48932bfbaba73a955205 100644
--- a/boards/px4/fmu-v2/fixedwing.cmake
+++ b/boards/px4/fmu-v2/fixedwing.cmake
@@ -21,6 +21,7 @@ px4_add_board(
 		#barometer # all available barometer drivers
 		barometer/ms5611
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake
index 2989307ca3cae28954ebb84f21f0b5caafdb520b..3c8fd1430c68366241e0aaa73516695e8603f242 100644
--- a/boards/px4/fmu-v2/lpe.cmake
+++ b/boards/px4/fmu-v2/lpe.cmake
@@ -22,6 +22,7 @@ px4_add_board(
 		#barometer # all available barometer drivers
 		barometer/ms5611
 		#batt_smbus
+		camera_capture
 		camera_trigger
 		#differential_pressure # all available differential pressure drivers
 		#differential_pressure/ms4525
diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake
index 2f5b4c505b6eb601dc4addc678f195e9c8f43db4..07863896f8a05620b0b6c241dfd43a6071e66215 100644
--- a/boards/px4/fmu-v2/multicopter.cmake
+++ b/boards/px4/fmu-v2/multicopter.cmake
@@ -19,6 +19,7 @@ px4_add_board(
 	DRIVERS
 		barometer/ms5611
 		batt_smbus
+		camera_capture
 		camera_trigger
 		distance_sensor # all available distance sensor drivers
 		gps
diff --git a/boards/px4/fmu-v2/rover.cmake b/boards/px4/fmu-v2/rover.cmake
index bb42a84dff9bebed0733a97b7f014d8ae09589c3..85cbb62f5b3ccc60bb306c0d45774cfb46cfe734 100644
--- a/boards/px4/fmu-v2/rover.cmake
+++ b/boards/px4/fmu-v2/rover.cmake
@@ -18,6 +18,7 @@ px4_add_board(
 	DRIVERS
 		barometer/ms5611
 		batt_smbus
+		camera_capture
 		camera_trigger
 		distance_sensor # all available distance sensor drivers
 		gps
diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake
index 3e6eec6e9eca82ff89e1e5fa92cb67bdfa1d4192..82a63e92dcc9d62dab7b4748a4e4f98a3217e76d 100644
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -22,8 +22,8 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
-		camera_trigger
 		camera_capture
+		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
 		gps
diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake
index f41a0a8476e07d25e6296557acf821b72334d530..b8c6423067e2daa7810167109f3a1be7b0bdfb4f 100644
--- a/boards/px4/fmu-v3/rtps.cmake
+++ b/boards/px4/fmu-v3/rtps.cmake
@@ -22,6 +22,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake
index 24ff0ea563bf90b50cd083999f802ea8aeb4e11e..ffb875d3eb51bc021a42dd824f73e1c7f517dadb 100644
--- a/boards/px4/fmu-v3/stackcheck.cmake
+++ b/boards/px4/fmu-v3/stackcheck.cmake
@@ -22,24 +22,28 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
-		lights/blinkm
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
 		gps
 		#heater
-		#imu # all available imu drivers
 		imu/adis16448
+		#imu # all available imu drivers
 		imu/l3gd20
 		imu/lsm303d
 		imu/mpu6000
 		imu/mpu9250
 		irlock
+		lights/blinkm
+		lights/oreoled
+		lights/pca8574
+		lights/rgbled
+		lights/rgbled_ncp5623c
+		#lights/rgbled_pwm
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		lights/oreoled
-		lights/pca8574
 		pca9685
 		#pmw3901
 		protocol_splitter
@@ -48,9 +52,6 @@ px4_add_board(
 		px4flow
 		px4fmu
 		px4io
-		lights/rgbled
-		lights/rgbled_ncp5623c
-		#lights/rgbled_pwm
 		roboclaw
 		stm32
 		stm32/adc
diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake
index b300f711244723ae7e18cf44196d6f8fdf6bd4de..3d08ae2f7de44b5cfdc3470bbb4aac25417ab8f4 100644
--- a/boards/px4/fmu-v4/default.cmake
+++ b/boards/px4/fmu-v4/default.cmake
@@ -18,6 +18,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake
index 8b292d57a52dec513397499693407415bea60e0e..5b49a1e143cc583239b59027915920e6cce730c8 100644
--- a/boards/px4/fmu-v4/rtps.cmake
+++ b/boards/px4/fmu-v4/rtps.cmake
@@ -18,6 +18,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake
index 0409440312803a0dcb3fc1b9c216de15eb26142c..8a5ff6e1ad391177a31b0c20eaeb67d86799f51b 100644
--- a/boards/px4/fmu-v4/stackcheck.cmake
+++ b/boards/px4/fmu-v4/stackcheck.cmake
@@ -18,6 +18,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake
index 736718e0cda74309a5eab64a3d2b3e9086a5cfe8..57dd490aa181b21f79bd61d300ceb5e4e82d7f93 100644
--- a/boards/px4/fmu-v4pro/default.cmake
+++ b/boards/px4/fmu-v4pro/default.cmake
@@ -21,6 +21,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
@@ -35,13 +36,13 @@ px4_add_board(
 		irlock
 		lights/blinkm
 		lights/oreoled
+		lights/pca8574
 		lights/rgbled
 		lights/rgbled_ncp5623c
 		#lights/rgbled_pwm
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		lights/pca8574
 		pca9685
 		#pmw3901
 		#protocol_splitter
diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
index d5bd745405e863ec5fb35d7acb4d140870864e5c..b0db71d0364a8fc3e3a9638002d4bc3a486dd910 100644
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -20,8 +20,8 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
-		camera_trigger
 		camera_capture
+		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
 		gps
@@ -29,9 +29,9 @@ px4_add_board(
 		imu/adis16448
 		#imu # all available imu drivers
 		imu/bmi055
+		imu/icm20948
 		imu/mpu6000
 		imu/mpu9250
-		imu/icm20948
 		irlock
 		lights/blinkm
 		lights/oreoled
@@ -124,4 +124,5 @@ px4_add_board(
 		rover_steering_control # Rover example app
 		segway
 		uuv_example_app
+
 	)
diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake
index 008891fb10aa4439a931007a7b7fc718a032d748..1b2497198efa414f032cf25120635e07c3a20128 100644
--- a/boards/px4/fmu-v5/fixedwing.cmake
+++ b/boards/px4/fmu-v5/fixedwing.cmake
@@ -19,6 +19,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake
index 5ca751398806c7d48e7fb0d1a4a382f814bd4542..1a2002dd984a33b80bd2d344e5605bfafad32044 100644
--- a/boards/px4/fmu-v5/multicopter.cmake
+++ b/boards/px4/fmu-v5/multicopter.cmake
@@ -20,6 +20,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		distance_sensor # all available distance sensor drivers
 		gps
diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake
index 5439f106cae392890edfb8fb98c146ed5cb1df43..ae10915f6f3a03c61bf9801d42a11a78576c4ef2 100644
--- a/boards/px4/fmu-v5/rover.cmake
+++ b/boards/px4/fmu-v5/rover.cmake
@@ -19,6 +19,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		distance_sensor # all available distance sensor drivers
 		gps
diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake
index 61bd96b99d32d1f3962928b98da7bfd7ce0b1a7c..d027cd282712e013185204ff6b0089070f819772 100644
--- a/boards/px4/fmu-v5/rtps.cmake
+++ b/boards/px4/fmu-v5/rtps.cmake
@@ -20,6 +20,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
@@ -28,19 +29,19 @@ px4_add_board(
 		imu/adis16448
 		#imu # all available imu drivers
 		imu/bmi055
+		imu/icm20948
 		imu/mpu6000
 		imu/mpu9250
-		imu/icm20948
 		irlock
 		lights/blinkm
 		lights/oreoled
+		lights/pca8574
 		lights/rgbled
 		lights/rgbled_ncp5623c
 		lights/rgbled_pwm
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		lights/pca8574
 		pca9685
 		pmw3901
 		protocol_splitter
diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake
index 00e0f95c72ff8f56e4f69200d7a5505f359516ef..cd411716f614f223f5d9ae7886d96285c2ba33b5 100644
--- a/boards/px4/fmu-v5/stackcheck.cmake
+++ b/boards/px4/fmu-v5/stackcheck.cmake
@@ -20,6 +20,7 @@ px4_add_board(
 	DRIVERS
 		barometer # all available barometer drivers
 		batt_smbus
+		camera_capture
 		camera_trigger
 		differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
@@ -28,19 +29,19 @@ px4_add_board(
 		imu/adis16448
 		#imu # all available imu drivers
 		imu/bmi055
+		imu/icm20948
 		imu/mpu6000
 		imu/mpu9250
-		imu/icm20948
 		#irlock
 		#lights/blinkm
 		#lights/oreoled
+		lights/pca8574
 		lights/rgbled
 		#lights/rgbled_ncp5623c
 		lights/rgbled_pwm
 		magnetometer # all available magnetometer drivers
 		#md25
 		mkblctrl
-		lights/pca8574
 		pca9685
 		pmw3901
 		#protocol_splitter