diff options
| author | px4dev <px4@purgatory.org> | 2013-08-13 00:34:11 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-08-13 00:34:11 -0700 |
| commit | 56d355414cbfef92b39af6830932e7f1487b03b9 (patch) | |
| tree | e4f53d32a7cccb0ccbd94b9dde90830572b39ee2 | |
| parent | b6676f6cb8306fb99274f8e0a784d8846928d920 (diff) | |
| download | px4-firmware-56d355414cbfef92b39af6830932e7f1487b03b9.tar.gz px4-firmware-56d355414cbfef92b39af6830932e7f1487b03b9.tar.bz2 px4-firmware-56d355414cbfef92b39af6830932e7f1487b03b9.zip | |
Fix handling of board config files. Treat CONFIG_BOARD like CONFIG_ARCH in the toolchain configuration.
| -rw-r--r-- | makefiles/firmware.mk | 5 | ||||
| -rw-r--r-- | makefiles/module.mk | 3 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 0d742c37d..ecff77db9 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -153,11 +153,8 @@ ifeq ($(BOARD_FILE),) $(error Config $(CONFIG) references board $(BOARD), but no board definition file found) endif export BOARD +export BOARD_FILE include $(BOARD_FILE) -ifeq ($(CONFIG_BOARD),) -$(error Board config for $(BOARD) does not define CONFIG_BOARD) -endif -EXTRADEFINES += -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD) $(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) \ |