Merge FMUv3 into FMUv2

cmake/configs/nuttx_px4fmu-v2_default.cmake

@@ -15,7 +15,7 @@ set(config_module_list
 	drivers/boards
 	drivers/rgbled
 	drivers/mpu6000
-	#drivers/mpu9250
+	drivers/mpu9250
 	drivers/lsm303d
 	drivers/l3gd20
 	drivers/hmc5883
@@ -49,20 +49,20 @@ set(config_module_list
 	#drivers/snapdragon_rc_pwm
 	drivers/lis3mdl
 	#drivers/iridiumsbd
-	drivers/ulanding
+	#drivers/ulanding
 
 	#
 	# System commands
 	#
-	systemcmds/bl_update
-	systemcmds/config
+	#systemcmds/bl_update
+	#systemcmds/config
 	#systemcmds/dumpfile
 	#systemcmds/esc_calib
 	systemcmds/hardfault_log
 	systemcmds/mixer
 	#systemcmds/motor_ramp
 	systemcmds/mtd
-	systemcmds/nshterm
+	#systemcmds/nshterm
 	systemcmds/param
 	systemcmds/perf
 	systemcmds/pwm
@@ -92,7 +92,7 @@ set(config_module_list
 	modules/load_mon
 	modules/navigator
 	modules/mavlink
-	modules/gpio_led
+	#modules/gpio_led
 	#modules/uavcan
 	modules/land_detector
 	modules/camera_feedback
@@ -146,7 +146,7 @@ set(config_module_list
 	lib/mixer
 	lib/runway_takeoff
 	lib/tailsitter_recovery
-	lib/terrain_estimation
+	#lib/terrain_estimation
 	lib/version
 	platforms/nuttx
 

cmake/configs/nuttx_px4fmu-v3_default.cmake

@@ -1,3 +1,8 @@
+
+# FMUv3 is FMUv2 with access to the full 2MB flash
+set(BOARD px4fmu-v2 CACHE string "" FORCE)
+set(LD_SCRIPT ld_full.script CACHE string "" FORCE)
+
 include(nuttx/px4_impl_nuttx)
 px4_nuttx_configure(HWCLASS m4 CONFIG nsh ROMFS y ROMFSROOT px4fmu_common IO px4io-v2)
 
@@ -203,4 +208,4 @@ set(config_module_list
 
 	# EKF
 	examples/ekf_att_pos_estimator
-)
+)