aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-02-20 21:25:04 -0800
committerpx4dev <px4@purgatory.org>2013-02-23 22:00:59 -0800
commit50739c1843d266a7ff26c26284dfec9d77cf80f5 (patch)
treee941449c161552a7d67109795855229086c07cb8 /Makefile
parentabe48bd7149fee4d18d709e7325cc70ca7230cb8 (diff)
downloadpx4-firmware-50739c1843d266a7ff26c26284dfec9d77cf80f5.tar.gz
px4-firmware-50739c1843d266a7ff26c26284dfec9d77cf80f5.tar.bz2
px4-firmware-50739c1843d266a7ff26c26284dfec9d77cf80f5.zip
platform -> board
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile34
1 files changed, 19 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 6af1f16e2..2495a363a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,22 @@ include $(PX4_BASE)/makefiles/setup.mk
CONFIGS ?= px4fmu_default px4io_default
#
-# Platforms (boards) that we build NuttX export kits for.
+# Boards that we build NuttX export kits for.
#
-PLATFORMS = px4fmu px4io
+BOARDS = px4fmu px4io
#
-# If the user has listed a config as a target, strip it out and override CONFIGS
+# Debugging
+#
+MQUIET = --no-print-directory
+#MQUIET = --print-directory
+
+################################################################################
+# No user-serviceable parts below
+################################################################################
+
+#
+# If the user has listed a config as a target, strip it out and override CONFIGS.
#
EXPLICIT_CONFIGS := $(filter $(CONFIGS),$(MAKECMDGOALS))
ifneq ($(EXPLICIT_CONFIGS),)
@@ -34,12 +44,6 @@ endif
STAGED_FIRMWARES = $(foreach config,$(CONFIGS),$(IMAGE_DIR)/$(config).px4)
FIRMWARES = $(foreach config,$(CONFIGS),$(BUILD_DIR)/$(config).build/firmware.px4)
-#
-# Debugging
-#
-MQUIET = --no-print-directory
-#MQUIET = --print-directory
-
all: $(STAGED_FIRMWARES)
#
@@ -76,18 +80,18 @@ $(FIRMWARES): $(BUILD_DIR)/%.build/firmware.px4:
#
# XXX PX4IO configuration name is bad - NuttX configs should probably all be "px4"
#
-NUTTX_ARCHIVES = $(foreach platform,$(PLATFORMS),$(ARCHIVE_DIR)/$(platform).export)
+NUTTX_ARCHIVES = $(foreach board,$(BOARDS),$(ARCHIVE_DIR)/$(board).export)
.PHONY: archives
archives: $(NUTTX_ARCHIVES)
-$(ARCHIVE_DIR)/%.export: platform = $(notdir $(basename $@))
-$(ARCHIVE_DIR)/%.export: configuration = $(if $(filter $(platform),px4io),io,nsh)
+$(ARCHIVE_DIR)/%.export: board = $(notdir $(basename $@))
+$(ARCHIVE_DIR)/%.export: configuration = $(if $(filter $(board),px4io),io,nsh)
$(NUTTX_ARCHIVES): $(ARCHIVE_DIR)/%.export: $(NUTTX_SRC) $(NUTTX_APPS)
- @echo %% Configuring NuttX for $(platform)
+ @echo %% Configuring NuttX for $(board)
$(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export)
$(Q) make -C $(NUTTX_SRC) -r $(MQUIET) distclean
- $(Q) (cd $(NUTTX_SRC)/tools && ./configure.sh $(platform)/$(configuration))
- @echo %% Exporting NuttX for $(platform)
+ $(Q) (cd $(NUTTX_SRC)/tools && ./configure.sh $(board)/$(configuration))
+ @echo %% Exporting NuttX for $(board)
$(Q) make -C $(NUTTX_SRC) -r $(MQUIET) export
$(Q) mkdir -p $(dir $@)
$(Q) $(COPY) $(NUTTX_SRC)/nuttx-export.zip $@