diff options
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/firmware.mk | 6 | ||||
-rw-r--r-- | makefiles/px4fmu_default.mk | 4 | ||||
-rw-r--r-- | makefiles/px4io_default.mk | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 34741e79e..3f41ec652 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -9,7 +9,12 @@ # Work out where this file is, so we can find other makefiles in the # same directory. # +# If PX4_BASE wasn't set previously, set it here now. +# export PX4_MK_INCLUDE ?= $(dir $(lastword $(MAKEFILE_LIST))) +ifeq ($(PX4_BASE),) +export PX4_BASE := $(abspath $(PX4_MK_INCLUDE)/..) +endif # # Use the linker script from the NuttX export @@ -36,6 +41,7 @@ include $(PX4_MK_INCLUDE)/$(PLATFORM).mk # # What we're going to build # +PRODUCT_BUNDLE = $(WORK_DIR)/firmware.px4 PRODUCT_BIN = $(WORK_DIR)/firmware.bin PRODUCT_SYM = $(WORK_DIR)/firmware.sym PRODUCTS = $(PRODUCT_BIN) $(PRODUCT_SYM) diff --git a/makefiles/px4fmu_default.mk b/makefiles/px4fmu_default.mk index 6e78126ff..1dd3e6ab4 100644 --- a/makefiles/px4fmu_default.mk +++ b/makefiles/px4fmu_default.mk @@ -2,6 +2,6 @@ # Makefile for the px4fmu_default configuration # -SRCS = $(PX4BASE)/platforms/empty.c +SRCS = $(PX4_BASE)/platforms/empty.c -include $(PX4BASE)/makefiles/firmware.mk +include $(PX_4BASE)/makefiles/firmware.mk diff --git a/makefiles/px4io_default.mk b/makefiles/px4io_default.mk index da480af09..2d96fa2fb 100644 --- a/makefiles/px4io_default.mk +++ b/makefiles/px4io_default.mk @@ -2,6 +2,6 @@ # Makefile for the px4io_default configuration # -SRCS = $(PX4BASE)/platforms/empty.c +SRCS = $(PX4_BASE)/platforms/empty.c -include $(PX4BASE)/makefiles/firmware.mk +include $(PX4_BASE)/makefiles/firmware.mk |