diff options
| author | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
| commit | b4029dd824cec7a0b53c62e960f80d90ddc6e13c (patch) | |
| tree | 2bae71f23af17bb0d9de26a914c859ec9af1e010 /makefiles | |
| parent | 43f1843cc750fcef07122feaeca07863ed28c036 (diff) | |
| download | px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.gz px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.bz2 px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.zip | |
Pull v2 pieces up to build with the merge
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/board_px4fmu-v2.mk (renamed from makefiles/board_px4fmuv2.mk) | 0 | ||||
| -rw-r--r-- | makefiles/board_px4io-v2.mk (renamed from makefiles/board_px4iov2.mk) | 0 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk (renamed from makefiles/config_px4fmuv2_default.mk) | 0 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk (renamed from makefiles/config_px4fmuv2_test.mk) | 5 | ||||
| -rw-r--r-- | makefiles/config_px4io-v2_default.mk (renamed from makefiles/config_px4iov2_default.mk) | 0 | ||||
| -rw-r--r-- | makefiles/setup.mk | 1 | ||||
| -rw-r--r-- | makefiles/upload.mk | 2 |
7 files changed, 1 insertions, 7 deletions
diff --git a/makefiles/board_px4fmuv2.mk b/makefiles/board_px4fmu-v2.mk index 4b3b7e585..4b3b7e585 100644 --- a/makefiles/board_px4fmuv2.mk +++ b/makefiles/board_px4fmu-v2.mk diff --git a/makefiles/board_px4iov2.mk b/makefiles/board_px4io-v2.mk index ee6b6125e..ee6b6125e 100644 --- a/makefiles/board_px4iov2.mk +++ b/makefiles/board_px4io-v2.mk diff --git a/makefiles/config_px4fmuv2_default.mk b/makefiles/config_px4fmu-v2_default.mk index c4499048c..c4499048c 100644 --- a/makefiles/config_px4fmuv2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk diff --git a/makefiles/config_px4fmuv2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 0bd6c18e5..9b3013a5b 100644 --- a/makefiles/config_px4fmuv2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -12,19 +12,14 @@ ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_test # MODULES += drivers/device MODULES += drivers/stm32 -MODULES += drivers/px4io MODULES += drivers/boards/px4fmuv2 MODULES += systemcmds/perf MODULES += systemcmds/reboot -# needed because things use it for logging -MODULES += modules/mavlink - # # Library modules # MODULES += modules/systemlib -MODULES += modules/systemlib/mixer MODULES += modules/uORB # diff --git a/makefiles/config_px4iov2_default.mk b/makefiles/config_px4io-v2_default.mk index f9f35d629..f9f35d629 100644 --- a/makefiles/config_px4iov2_default.mk +++ b/makefiles/config_px4io-v2_default.mk diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 92461fafb..a0e880a0d 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -45,7 +45,6 @@ export PX4_INCLUDE_DIR = $(abspath $(PX4_BASE)/src/include)/ export PX4_MODULE_SRC = $(abspath $(PX4_BASE)/src)/ export PX4_MK_DIR = $(abspath $(PX4_BASE)/makefiles)/ export NUTTX_SRC = $(abspath $(PX4_BASE)/NuttX/nuttx)/ -export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/NuttX/apps)/ export MAVLINK_SRC = $(abspath $(PX4_BASE)/mavlink)/ export ROMFS_SRC = $(abspath $(PX4_BASE)/ROMFS)/ export IMAGE_DIR = $(abspath $(PX4_BASE)/Images)/ diff --git a/makefiles/upload.mk b/makefiles/upload.mk index 4b01b447d..c55e3f188 100644 --- a/makefiles/upload.mk +++ b/makefiles/upload.mk @@ -27,7 +27,7 @@ all: upload-$(METHOD)-$(BOARD) upload-serial-px4fmu-v1: $(BUNDLE) $(UPLOADER) $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) -upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER) +upload-serial-px4fmu-v2: $(BUNDLE) $(UPLOADER) $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) # |