diff options
| author | px4dev <px4@purgatory.org> | 2013-08-03 10:06:10 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-08-03 10:06:10 -0700 |
| commit | c14a71c09564567936707edd96d4e266f9b67c74 (patch) | |
| tree | 9d2a92d5068c02d7871083ec387c96b870845f63 /makefiles | |
| parent | 24c43ad62d03fdfc0a13b5e6fae22c29bbc827c3 (diff) | |
| download | px4-firmware-c14a71c09564567936707edd96d4e266f9b67c74.tar.gz px4-firmware-c14a71c09564567936707edd96d4e266f9b67c74.tar.bz2 px4-firmware-c14a71c09564567936707edd96d4e266f9b67c74.zip | |
Move NuttX configurations out of the NuttX tree proper. This reduces the diffs we have to carry against the NuttX upstream repo to just our local patches to the NuttX code itself.
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/setup.mk | 1 | ||||
| -rw-r--r-- | makefiles/upload.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 92461fafb..168e41a5c 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -65,6 +65,7 @@ export INCLUDE_DIRS := $(PX4_MODULE_SRC) \ export MKFW = $(PX4_BASE)/Tools/px_mkfw.py export UPLOADER = $(PX4_BASE)/Tools/px_uploader.py export COPY = cp +export COPYDIR = cp -Rf export REMOVE = rm -f export RMDIR = rm -rf export GENROMFS = genromfs 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 |