diff options
| author | px4dev <px4@purgatory.org> | 2013-08-14 21:23:00 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-08-14 21:23:00 -0700 |
| commit | 33863165b2c5b932ab4b4908217bae0014cfa638 (patch) | |
| tree | aa46a5de62248c04f7017ccccc7f5c897f5463eb /makefiles | |
| parent | 3b10f8431def73222823c1c2abe1bb7422d851dc (diff) | |
| parent | de749a3602423f5ee6ca56f3cf2dfff04e31ec6d (diff) | |
| download | px4-firmware-33863165b2c5b932ab4b4908217bae0014cfa638.tar.gz px4-firmware-33863165b2c5b932ab4b4908217bae0014cfa638.tar.bz2 px4-firmware-33863165b2c5b932ab4b4908217bae0014cfa638.zip | |
Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) into fmuv2_bringup
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/board_px4fmu-v1.mk | 1 | ||||
| -rw-r--r-- | makefiles/board_px4fmu-v2.mk | 1 | ||||
| -rw-r--r-- | makefiles/board_px4io-v1.mk | 1 | ||||
| -rw-r--r-- | makefiles/board_px4io-v2.mk | 1 | ||||
| -rw-r--r-- | makefiles/firmware.mk | 1 | ||||
| -rw-r--r-- | makefiles/module.mk | 3 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 7 |
7 files changed, 14 insertions, 1 deletions
diff --git a/makefiles/board_px4fmu-v1.mk b/makefiles/board_px4fmu-v1.mk index 837069644..4d692e31a 100644 --- a/makefiles/board_px4fmu-v1.mk +++ b/makefiles/board_px4fmu-v1.mk @@ -6,5 +6,6 @@ # Configure the toolchain # CONFIG_ARCH = CORTEXM4F +CONFIG_BOARD = PX4FMU_V1 include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk diff --git a/makefiles/board_px4fmu-v2.mk b/makefiles/board_px4fmu-v2.mk index 4b3b7e585..e9a2985b7 100644 --- a/makefiles/board_px4fmu-v2.mk +++ b/makefiles/board_px4fmu-v2.mk @@ -6,5 +6,6 @@ # Configure the toolchain # CONFIG_ARCH = CORTEXM4F +CONFIG_BOARD = PX4FMU_V2 include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk diff --git a/makefiles/board_px4io-v1.mk b/makefiles/board_px4io-v1.mk index b0eb2dae7..1872a4124 100644 --- a/makefiles/board_px4io-v1.mk +++ b/makefiles/board_px4io-v1.mk @@ -6,5 +6,6 @@ # Configure the toolchain # CONFIG_ARCH = CORTEXM3 +CONFIG_BOARD = PX4IO_V1 include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk diff --git a/makefiles/board_px4io-v2.mk b/makefiles/board_px4io-v2.mk index ee6b6125e..50a4068fb 100644 --- a/makefiles/board_px4io-v2.mk +++ b/makefiles/board_px4io-v2.mk @@ -6,5 +6,6 @@ # Configure the toolchain # CONFIG_ARCH = CORTEXM3 +CONFIG_BOARD = PX4IO_V2 include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 2085d45dd..8a027a0a8 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -153,6 +153,7 @@ ifeq ($(BOARD_FILE),) $(error Config $(CONFIG) references board $(BOARD), but no board definition file found) endif export BOARD +export BOARD_FILE include $(BOARD_FILE) $(info % BOARD = $(BOARD)) diff --git a/makefiles/module.mk b/makefiles/module.mk index 9e4cbafc9..9c1a828cc 100644 --- a/makefiles/module.mk +++ b/makefiles/module.mk @@ -98,6 +98,7 @@ # # CONFIG # BOARD +# BOARD_FILE # MODULE_WORK_DIR # MODULE_OBJ # MODULE_MK @@ -117,7 +118,7 @@ $(info %% MODULE_MK = $(MODULE_MK)) # # Get the board/toolchain config # -include $(PX4_MK_DIR)/board_$(BOARD).mk +include $(BOARD_FILE) # # Get the module's config diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 3f4d3371a..9fd2dd516 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -85,6 +85,13 @@ ifeq ($(ARCHCPUFLAGS),) $(error Must set CONFIG_ARCH to one of CORTEXM4F, CORTEXM4 or CORTEXM3) endif +# Set the board flags +# +ifeq ($(CONFIG_BOARD),) +$(error Board config does not define CONFIG_BOARD) +endif +ARCHDEFINES += -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD) + # optimisation flags # ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ |