diff options
| author | px4dev <px4@purgatory.org> | 2013-07-07 12:22:56 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-07-07 12:22:56 -0700 |
| commit | 43f1843cc750fcef07122feaeca07863ed28c036 (patch) | |
| tree | 77f0192152038670fe5a875a2a38232b28e7d044 /Makefile | |
| parent | 9fe257c4d151280c770e607bc3160703f9503889 (diff) | |
| parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
| download | px4-firmware-43f1843cc750fcef07122feaeca07863ed28c036.tar.gz px4-firmware-43f1843cc750fcef07122feaeca07863ed28c036.tar.bz2 px4-firmware-43f1843cc750fcef07122feaeca07863ed28c036.zip | |
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -145,9 +145,9 @@ ifneq ($(filter archives,$(MAKECMDGOALS)),) endif $(ARCHIVE_DIR)%.export: board = $(notdir $(basename $@)) -$(ARCHIVE_DIR)%.export: configuration = $(if $(filter px4io px4iov2,$(board)),io,nsh) +$(ARCHIVE_DIR)%.export: configuration = nsh $(NUTTX_ARCHIVES): $(ARCHIVE_DIR)%.export: $(NUTTX_SRC) $(NUTTX_APPS) - @echo %% Configuring NuttX for $(board)/$(configuration) + @echo %% Configuring NuttX for $(board) $(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export) $(Q) make -r -j1 -C $(NUTTX_SRC) -r $(MQUIET) distclean $(Q) (cd $(NUTTX_SRC)tools && ./configure.sh $(board)/$(configuration)) |