aboutsummaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
Diffstat (limited to 'makefiles')
-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.mk2
-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
6 files changed, 3 insertions, 5 deletions
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