From a3334e06027922c9e59168edf5c07461ab7af5fb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Sun, 31 May 2015 14:50:43 +1000
Subject: [PATCH] PX4: updates for upstream merge

---
 mk/PX4/px4_common.mk | 1 -
 mk/px4_targets.mk    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mk/PX4/px4_common.mk b/mk/PX4/px4_common.mk
index cf5421ae02..77b85d0777 100644
--- a/mk/PX4/px4_common.mk
+++ b/mk/PX4/px4_common.mk
@@ -42,7 +42,6 @@ MODULES		+= drivers/batt_smbus
 # System commands
 #
 MODULES		+= systemcmds/bl_update
-MODULES		+= systemcmds/boardinfo
 MODULES		+= systemcmds/mixer
 MODULES		+= systemcmds/perf
 MODULES		+= systemcmds/pwm
diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk
index 27e42d71b1..0a77d132e0 100644
--- a/mk/px4_targets.mk
+++ b/mk/px4_targets.mk
@@ -82,7 +82,7 @@ module_mk:
 px4-v1: $(BUILDROOT)/make.flags CHECK_MODULES $(PX4_ROOT)/Archives/px4fmu-v1.export $(SKETCHCPP) module_mk px4-io-v1
 	$(RULEHDR)
 	$(v) rm -f $(PX4_ROOT)/makefiles/$(PX4_V1_CONFIG_FILE)
-	$(v) cp $(PX4_V1_CONFIG_FILE) $(PX4_ROOT)/makefiles/
+	$(v) cp $(PX4_V1_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/
 	$(v) $(PX4_MAKE) px4fmu-v1_APM
 	$(v) /bin/rm -f $(SKETCH)-v1.px4
 	$(v) cp $(PX4_ROOT)/Images/px4fmu-v1_APM.px4 $(SKETCH)-v1.px4
@@ -92,7 +92,7 @@ px4-v1: $(BUILDROOT)/make.flags CHECK_MODULES $(PX4_ROOT)/Archives/px4fmu-v1.exp
 px4-v2: $(BUILDROOT)/make.flags CHECK_MODULES $(PX4_ROOT)/Archives/px4fmu-v2.export $(SKETCHCPP) module_mk px4-io-v2
 	$(RULEHDR)
 	$(v) rm -f $(PX4_ROOT)/makefiles/$(PX4_V2_CONFIG_FILE)
-	$(v) cp $(PX4_V2_CONFIG_FILE) $(PX4_ROOT)/makefiles/
+	$(v) cp $(PX4_V2_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/
 	$(PX4_MAKE) px4fmu-v2_APM
 	$(v) /bin/rm -f $(SKETCH)-v2.px4
 	$(v) cp $(PX4_ROOT)/Images/px4fmu-v2_APM.px4 $(SKETCH)-v2.px4