diff options
| author | Simon Wilks <sjwilks@gmail.com> | 2013-07-09 08:04:07 +0200 |
|---|---|---|
| committer | Simon Wilks <sjwilks@gmail.com> | 2013-07-09 08:04:07 +0200 |
| commit | a18c6cea18aff92f226fdcd9da666ef1a9b6c99b (patch) | |
| tree | aa37dc3799a5a1bba8aae439da7f2fb661d5ca4f /makefiles | |
| parent | 86adaeb3e8f28c92005a38b7c71e12111efe8694 (diff) | |
| parent | ced2871263d5395da84ae6d034aa18015bf66d1c (diff) | |
| download | px4-firmware-a18c6cea18aff92f226fdcd9da666ef1a9b6c99b.tar.gz px4-firmware-a18c6cea18aff92f226fdcd9da666ef1a9b6c99b.tar.bz2 px4-firmware-a18c6cea18aff92f226fdcd9da666ef1a9b6c99b.zip | |
Merge remote-tracking branch 'upstream/master' into hott-esc
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/board_px4fmu-v1.mk (renamed from makefiles/board_px4fmu.mk) | 0 | ||||
| -rw-r--r-- | makefiles/board_px4io-v1.mk (renamed from makefiles/board_px4io.mk) | 0 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk (renamed from makefiles/config_px4fmu_default.mk) | 3 | ||||
| -rw-r--r-- | makefiles/config_px4io-v1_default.mk (renamed from makefiles/config_px4io_default.mk) | 0 | ||||
| -rw-r--r-- | makefiles/setup.mk | 4 | ||||
| -rw-r--r-- | makefiles/upload.mk | 2 |
6 files changed, 5 insertions, 4 deletions
diff --git a/makefiles/board_px4fmu.mk b/makefiles/board_px4fmu-v1.mk index 837069644..837069644 100644 --- a/makefiles/board_px4fmu.mk +++ b/makefiles/board_px4fmu-v1.mk diff --git a/makefiles/board_px4io.mk b/makefiles/board_px4io-v1.mk index b0eb2dae7..b0eb2dae7 100644 --- a/makefiles/board_px4io.mk +++ b/makefiles/board_px4io-v1.mk diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu-v1_default.mk index 0d9ca60c1..74be1cd23 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -133,4 +133,5 @@ endef # command priority stack entrypoint BUILTIN_COMMANDS := \ $(call _B, sercon, , 2048, sercon_main ) \ - $(call _B, serdis, , 2048, serdis_main ) + $(call _B, serdis, , 2048, serdis_main ) \ + $(call _B, sysinfo, , 2048, sysinfo_main ) diff --git a/makefiles/config_px4io_default.mk b/makefiles/config_px4io-v1_default.mk index cf70391bc..cf70391bc 100644 --- a/makefiles/config_px4io_default.mk +++ b/makefiles/config_px4io-v1_default.mk diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 111193093..92461fafb 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -44,8 +44,8 @@ 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)/ -export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/apps)/ +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 5ef92728f..4b01b447d 100644 --- a/makefiles/upload.mk +++ b/makefiles/upload.mk @@ -24,7 +24,7 @@ endif .PHONY: all upload-$(METHOD)-$(BOARD) all: upload-$(METHOD)-$(BOARD) -upload-serial-px4fmu: $(BUNDLE) $(UPLOADER) +upload-serial-px4fmu-v1: $(BUNDLE) $(UPLOADER) $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER) |