diff options
| author | px4dev <px4@purgatory.org> | 2013-01-16 21:12:15 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-02-23 22:00:59 -0800 |
| commit | e9f2197bfa40522d6a58e01888dada4531d9dbcf (patch) | |
| tree | 468ff734245f0605c937932659c94d8fd5eb766c /makefiles/firmware.mk | |
| parent | 06951351054df9799b966b04efd8f5aae6e3a062 (diff) | |
| download | px4-firmware-e9f2197bfa40522d6a58e01888dada4531d9dbcf.tar.gz px4-firmware-e9f2197bfa40522d6a58e01888dada4531d9dbcf.tar.bz2 px4-firmware-e9f2197bfa40522d6a58e01888dada4531d9dbcf.zip | |
Move upload functionality out into a separate makefile.
Diffstat (limited to 'makefiles/firmware.mk')
| -rw-r--r-- | makefiles/firmware.mk | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 1ecc7da95..c85c5c919 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -68,7 +68,6 @@ export ARCHIVE_DIR = $(PX4_BASE)/Archives # XXX should be in a common toolchain config somewhere. # MKFW = $(PX4_BASE)/Tools/px_mkfw.py -UPLOADER = $(PX4_BASE)/Tools/px_uploader.py COPY = cp REMOVE = rm -f RMDIR = rm -rf @@ -98,21 +97,6 @@ ifeq ($(SYSTYPE),Darwin) export PATH := $(PATH):/usr/local/bin endif -# -# Serial port defaults. -# -# XXX The uploader should be smarter than this. -# -ifeq ($(SYSTYPE),Darwin) -SERIAL_PORTS ?= "/dev/tty.usbmodemPX1,/dev/tty.usbmodemPX2,/dev/tty.usbmodemPX3,/dev/tty.usbmodemPX4,/dev/tty.usbmodem1,/dev/tty.usbmodem2,/dev/tty.usbmodem3,/dev/tty.usbmodem4" -endif -ifeq ($(SYSTYPE),Linux) -SERIAL_PORTS ?= "/dev/ttyACM5,/dev/ttyACM4,/dev/ttyACM3,/dev/ttyACM2,/dev/ttyACM1,/dev/ttyACM0" -endif -ifeq ($(SERIAL_PORTS),) -SERIAL_PORTS = "\\\\.\\COM32,\\\\.\\COM31,\\\\.\\COM30,\\\\.\\COM29,\\\\.\\COM28,\\\\.\\COM27,\\\\.\\COM26,\\\\.\\COM25,\\\\.\\COM24,\\\\.\\COM23,\\\\.\\COM22,\\\\.\\COM21,\\\\.\\COM20,\\\\.\\COM19,\\\\.\\COM18,\\\\.\\COM17,\\\\.\\COM16,\\\\.\\COM15,\\\\.\\COM14,\\\\.\\COM13,\\\\.\\COM12,\\\\.\\COM11,\\\\.\\COM10,\\\\.\\COM9,\\\\.\\COM8,\\\\.\\COM7,\\\\.\\COM6,\\\\.\\COM5,\\\\.\\COM4,\\\\.\\COM3,\\\\.\\COM2,\\\\.\\COM1,\\\\.\\COM0" -endif - ################################################################################ # NuttX libraries and paths ################################################################################ @@ -203,8 +187,12 @@ $(PRODUCT_BIN): $(PRODUCT_SYM) $(PRODUCT_SYM): $(OBJS) $(GLOBAL_DEPS) $(LINK_DEPS) $(call LINK,$@,$(OBJS)) -upload: $(PRODUCT_BUNDLE) $(UPLOADER) - @python -u $(UPLOADER) --port $(SERIAL_PORTS) $(PRODUCT_BUNDLE) +upload: $(PRODUCT_BUNDLE) $(PRODUCT_BIN) + $(Q) make -f $(PX4_MK_INCLUDE)/upload.mk \ + METHOD=serial \ + PRODUCT=$(PRODUCT) \ + BUNDLE=$(PRODUCT_BUNDLE) \ + BIN=$(PRODUCT_BIN) clean: @echo %% cleaning |