From 6ea5853161a7c9be2ef81ad91b3359b7045c2a0b Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 6 Jul 2019 11:29:21 -0400
Subject: [PATCH] px4_fmu-v2_multicopter sync with px4_fmu-v2_default

---
 boards/px4/fmu-v2/default.cmake     | 2 +-
 boards/px4/fmu-v2/multicopter.cmake | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake
index ffa3b947a2..6403c594fa 100644
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -95,7 +95,7 @@ px4_add_board(
 		#dumpfile
 		#esc_calib
 		hardfault_log
-		#i2c
+		#i2cdetect
 		#led_control
 		mixer
 		#motor_ramp
diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake
index ffb95d8155..6bb8deea5f 100644
--- a/boards/px4/fmu-v2/multicopter.cmake
+++ b/boards/px4/fmu-v2/multicopter.cmake
@@ -7,7 +7,9 @@ px4_add_board(
 	TOOLCHAIN arm-none-eabi
 	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
+	BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
 	IO px4_io-v2_default
+	CONSTRAINED_FLASH
 	#UAVCAN_INTERFACES 2
 
 	SERIAL_PORTS
@@ -63,7 +65,7 @@ px4_add_board(
 		#dumpfile
 		#esc_calib
 		hardfault_log
-		i2cdetect
+		#i2cdetect
 		#led_control
 		mixer
 		#motor_ramp