diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-04-17 15:52:09 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-22 02:30:13 -1000 |
| commit | d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7 (patch) | |
| tree | 77a19f6435ab69bd52fa854c5aab0e876e810bd9 /Makefile | |
| parent | 7e7877b372c3c35a8f6150379aad896e5cdba72e (diff) | |
| download | px4-firmware-d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7.tar.gz px4-firmware-d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7.tar.bz2 px4-firmware-d5cf0ec899ca2b47e6017a8d11c668cd1fd84cf7.zip | |
Moved Nuttx Based uavcan bootloader ito PX4 tree
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 17 insertions, 5 deletions
@@ -62,6 +62,17 @@ CONFIGS ?= $(KNOWN_CONFIGS) KNOWN_BOARDS := $(subst board_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)board_*.mk)))) BOARDS ?= $(KNOWN_BOARDS) + +# +# Nuttx configurations +# +NUTTX_CONFIGURATION ?= nsh + +ifeq ($(NUTTX_CONFIGURATION),bootloader) +BOOTLOADER = bootloader +BOOTLOADEREXT =.$(BOOTLOADER) +endif + # # Debugging # @@ -133,6 +144,7 @@ $(FIRMWARES): $(BUILD_DIR)%.build/firmware.px4: generateuorbtopicheaders checksu -f $(PX4_MK_DIR)firmware.mk \ CONFIG=$(config) \ WORK_DIR=$(work_dir) \ + BOOTLOADER=$(BOOTLOADER) \ $(FIRMWARE_GOAL) # @@ -172,17 +184,17 @@ endif J?=1 $(ARCHIVE_DIR)%.export: board = $(notdir $(basename $@)) -$(ARCHIVE_DIR)%.export: configuration = nsh +$(ARCHIVE_DIR)%.export: configuration = $(NUTTX_CONFIGURATION) $(NUTTX_ARCHIVES): $(ARCHIVE_DIR)%.export: $(NUTTX_SRC) - @$(ECHO) %% Configuring NuttX for $(board) + @$(ECHO) %% Configuring NuttX for $(board) $(BOOTLOADER) $(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export) $(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) distclean $(Q) (cd $(NUTTX_SRC)/configs && $(COPYDIR) $(PX4_BASE)nuttx-configs/$(board) .) $(Q) (cd $(NUTTX_SRC)tools && ./configure.sh $(board)/$(configuration)) - @$(ECHO) %% Exporting NuttX for $(board) + @$(ECHO) %% Exporting NuttX for $(board) $(BOOTLOADER) $(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) CONFIG_ARCH_BOARD=$(board) export - $(Q) $(MKDIR) -p $(dir $@) - $(Q) $(COPY) $(NUTTX_SRC)nuttx-export.zip $@ + $(Q) $(MKDIR) -p $(dir $@$(BOOTLOADEREXT)) + $(Q) $(COPY) $(NUTTX_SRC)nuttx-export.zip $@$(BOOTLOADEREXT) $(Q) (cd $(NUTTX_SRC)/configs && $(RMDIR) $(board)) NUTTX_PATCHES := $(wildcard $(PX4_NUTTX_PATCH_DIR)*.patch) |