aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2013-05-19 16:52:25 +0400
committerAnton Babushkin <anton.babushkin@me.com>2013-05-19 16:52:25 +0400
commite8ec2ed93a22089ea8e5190368a78e26aa80fc0b (patch)
treecbaeeea8e00e35c43fff9b35379ba68a4fed4b20
parentc21ba6c5007530f22db704924e79e9bb1ea79130 (diff)
parent504b6d12561d68874ded4c1f747c21926a065045 (diff)
downloadpx4-firmware-e8ec2ed93a22089ea8e5190368a78e26aa80fc0b.tar.gz
px4-firmware-e8ec2ed93a22089ea8e5190368a78e26aa80fc0b.tar.bz2
px4-firmware-e8ec2ed93a22089ea8e5190368a78e26aa80fc0b.zip
Merge branch 'master' into seatbelt_multirotor
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1d1287b7f..dea344390 100644
--- a/Makefile
+++ b/Makefile
@@ -95,9 +95,14 @@ all: $(STAGED_FIRMWARES)
#
# Copy FIRMWARES into the image directory.
#
+# XXX copying the .bin files is a hack to work around the PX4IO uploader
+# not supporting .px4 files, and it should be deprecated onced that
+# is taken care of.
+#
$(STAGED_FIRMWARES): $(IMAGE_DIR)%.px4: $(BUILD_DIR)%.build/firmware.px4
@echo %% Copying $@
$(Q) $(COPY) $< $@
+ $(Q) $(COPY) $(patsubst %.px4,%.bin,$<) $(patsubst %.px4,%.bin,$@)
#
# Generate FIRMWARES.