diff options
| author | px4dev <px4@purgatory.org> | 2013-05-22 21:39:30 +0200 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-05-22 21:39:30 +0200 |
| commit | 437d9e4180b6248d0f0a4176c875b41deceef17d (patch) | |
| tree | 689af295626df673c13994f435ed221ba6f268e5 /Makefile | |
| parent | e67022f874f0fa091ed7dffd617c70c0c0253b5c (diff) | |
| parent | 78d29045c4da2d5ed4cea50fc2184b57dea01951 (diff) | |
| download | px4-firmware-437d9e4180b6248d0f0a4176c875b41deceef17d.tar.gz px4-firmware-437d9e4180b6248d0f0a4176c875b41deceef17d.tar.bz2 px4-firmware-437d9e4180b6248d0f0a4176c875b41deceef17d.zip | |
Merge branch 'fmuv2_bringup' into fmuv2_bringup_io2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,5 @@ # -# Copyright (C) 2012 PX4 Development Team. All rights reserved. +# Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -95,9 +95,14 @@ all: $(STAGED_FIRMWARES) # # Copy FIRMWARES into the image directory. # +# XXX copying the .bin files is a hack to work around the PX4IO uploader +# not supporting .px4 files, and it should be deprecated onced that +# is taken care of. +# $(STAGED_FIRMWARES): $(IMAGE_DIR)%.px4: $(BUILD_DIR)%.build/firmware.px4 @echo %% Copying $@ $(Q) $(COPY) $< $@ + $(Q) $(COPY) $(patsubst %.px4,%.bin,$<) $(patsubst %.px4,%.bin,$@) # # Generate FIRMWARES. @@ -140,7 +145,7 @@ ifneq ($(filter archives,$(MAKECMDGOALS)),) endif $(ARCHIVE_DIR)%.export: board = $(notdir $(basename $@)) -$(ARCHIVE_DIR)%.export: configuration = $(if $(findstring px4io,$(board)),io,nsh) +$(ARCHIVE_DIR)%.export: configuration = $(if $(filter px4io px4iov2,$(board)),io,nsh) $(NUTTX_ARCHIVES): $(ARCHIVE_DIR)%.export: $(NUTTX_SRC) $(NUTTX_APPS) @echo %% Configuring NuttX for $(board)/$(configuration) $(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export) @@ -159,11 +164,11 @@ $(NUTTX_ARCHIVES): $(ARCHIVE_DIR)%.export: $(NUTTX_SRC) $(NUTTX_APPS) .PHONY: clean clean: $(Q) $(RMDIR) $(BUILD_DIR)*.build - $(Q) $(REMOVE) -f $(IMAGE_DIR)*.px4 + $(Q) $(REMOVE) $(IMAGE_DIR)*.px4 .PHONY: distclean distclean: clean - $(Q) $(REMOVE) -f $(ARCHIVE_DIR)*.export + $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export $(Q) make -C $(NUTTX_SRC) -r $(MQUIET) distclean # @@ -196,6 +201,11 @@ help: @echo " distclean" @echo " Remove all compilation products, including NuttX RTOS archives." @echo "" + @echo " upload" + @echo " When exactly one config is being built, add this target to upload the" + @echo " firmware to the board when the build is complete. Not supported for" + @echo " all configurations." + @echo "" @echo " Common options:" @echo " ---------------" @echo "" |