diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | makefiles/config_px4fmu_default.mk (renamed from makefiles/px4fmu_default.mk) | 1 | ||||
| -rw-r--r-- | makefiles/config_px4io_default.mk (renamed from makefiles/px4io_default.mk) | 1 | ||||
| -rw-r--r-- | makefiles/firmware.mk | 2 | ||||
| -rw-r--r-- | makefiles/platform_px4fmu.mk (renamed from makefiles/px4fmu.mk) | 2 | ||||
| -rw-r--r-- | makefiles/platform_px4io.mk (renamed from makefiles/px4io.mk) | 2 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk (renamed from makefiles/gnu-arm-eabi.mk) | 0 |
7 files changed, 8 insertions, 9 deletions
@@ -69,13 +69,14 @@ $(STAGED_FIRMWARES): $(IMAGE_DIR)/%.px4: $(BUILD_DIR)/%.build/firmware.px4 # # Generate FIRMWARES. # +.PHONY: $(FIRMWARES) $(BUILD_DIR)/%.build/firmware.px4: config = $(patsubst $(BUILD_DIR)/%.build/firmware.px4,%,$@) $(BUILD_DIR)/%.build/firmware.px4: work_dir = $(BUILD_DIR)/$(config).build $(FIRMWARES): $(BUILD_DIR)/%.build/firmware.px4: @echo %%%% Building $(config) in $(work_dir) $(Q) mkdir -p $(work_dir) $(Q) make -C $(work_dir) \ - -f $(PX4_BASE)/makefiles/$(config).mk \ + -f $(PX4_BASE)/makefiles/config_$(config).mk \ WORK_DIR=$(work_dir) # @@ -89,19 +90,19 @@ $(FIRMWARES): $(BUILD_DIR)/%.build/firmware.px4: # XXX Should support fetching/unpacking from a separate directory to permit # downloads of the prebuilt archives as well... # -# XXX PX4IO config name is bad - we should just call them all "px4" +# XXX PX4IO configuration name is bad - NuttX configs should probably all be "px4" # NUTTX_ARCHIVES = $(foreach platform,$(PLATFORMS),$(ARCHIVE_DIR)/$(platform).export) .PHONY: archives archives: $(NUTTX_ARCHIVES) $(ARCHIVE_DIR)/%.export: platform = $(notdir $(basename $@)) -$(ARCHIVE_DIR)/%.export: config = $(if $(filter $(platform),px4io),io,nsh) +$(ARCHIVE_DIR)/%.export: configuration = $(if $(filter $(platform),px4io),io,nsh) $(NUTTX_ARCHIVES): $(ARCHIVE_DIR)/%.export: $(NUTTX_SRC) $(NUTTX_APPS) @echo %% Configuring NuttX for $(platform) $(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export) $(Q) make -C $(NUTTX_SRC) -r $(MQUIET) distclean - $(Q) (cd $(NUTTX_SRC)/tools && ./configure.sh $(platform)/$(config)) + $(Q) (cd $(NUTTX_SRC)/tools && ./configure.sh $(platform)/$(configuration)) @echo Generating ROMFS for $(platform) XXX move this! $(Q) make -C $(ROMFS_SRC) all @echo %% Exporting NuttX for $(platform) diff --git a/makefiles/px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 6f7eaa41d..45b1170ff 100644 --- a/makefiles/px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -3,7 +3,6 @@ # CONFIG = px4fmu_default -PLATFORM = px4fmu SRCS = $(PX4_BASE)/platforms/empty.c include $(PX4_BASE)/makefiles/firmware.mk diff --git a/makefiles/px4io_default.mk b/makefiles/config_px4io_default.mk index d4f43d701..f47e7968b 100644 --- a/makefiles/px4io_default.mk +++ b/makefiles/config_px4io_default.mk @@ -3,7 +3,6 @@ # CONFIG = px4io_default -PLATFORM = px4io SRCS = $(PX4_BASE)/platforms/empty.c include $(PX4_BASE)/makefiles/firmware.mk diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index cde646036..338bda8d3 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -84,7 +84,7 @@ $(error At least one of the PLATFORM or CONFIG variables must be set before incl endif PLATFORM := $(firstword $(subst _, ,$(CONFIG))) endif -include $(PX4_MK_INCLUDE)/$(PLATFORM).mk +include $(PX4_MK_INCLUDE)/platform_$(PLATFORM).mk # # Makefile debugging. diff --git a/makefiles/px4fmu.mk b/makefiles/platform_px4fmu.mk index 75833de9f..a9e103cc8 100644 --- a/makefiles/px4fmu.mk +++ b/makefiles/platform_px4fmu.mk @@ -7,4 +7,4 @@ # CONFIG_ARCH = CORTEXM4F -include $(PX4_MK_INCLUDE)/gnu-arm-eabi.mk +include $(PX4_MK_INCLUDE)/toolchain_gnu-arm-eabi.mk diff --git a/makefiles/px4io.mk b/makefiles/platform_px4io.mk index 8ea9582cb..7de24a60b 100644 --- a/makefiles/px4io.mk +++ b/makefiles/platform_px4io.mk @@ -7,4 +7,4 @@ # CONFIG_ARCH = CORTEXM3 -include $(PX4_MK_INCLUDE)/gnu-arm-eabi.mk +include $(PX4_MK_INCLUDE)/toolchain_gnu-arm-eabi.mk diff --git a/makefiles/gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 73ac30669..73ac30669 100644 --- a/makefiles/gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk |