diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
| commit | 7476b03543f879df5ea29d44be147ff4926f8216 (patch) | |
| tree | e1c056fa3e12b2c2c3ae601ae2835ac086b60338 /makefiles/upload.mk | |
| parent | 39ae01dd07d53e3509826ae3737fc6a509adec34 (diff) | |
| parent | d2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff) | |
| download | px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.gz px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.bz2 px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.zip | |
Merge branch 'master' into new_state_machine_drton
Diffstat (limited to 'makefiles/upload.mk')
| -rw-r--r-- | makefiles/upload.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/makefiles/upload.mk b/makefiles/upload.mk index 4b01b447d..3aebef863 100644 --- a/makefiles/upload.mk +++ b/makefiles/upload.mk @@ -27,8 +27,6 @@ all: upload-$(METHOD)-$(BOARD) upload-serial-px4fmu-v1: $(BUNDLE) $(UPLOADER) $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) -upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER) - $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) # # JTAG firmware uploading with OpenOCD |