From 5e2d67617369474406d86d4eae5ba9a24d5cbb9f Mon Sep 17 00:00:00 2001 From: px4dev Date: Mon, 12 Aug 2013 21:57:11 -0700 Subject: Remove our depdenency on CONFIG_ARCH_BOARD_* coming from --- makefiles/board_px4fmu-v1.mk | 1 + makefiles/board_px4io-v1.mk | 1 + makefiles/firmware.mk | 4 ++++ 3 files changed, 6 insertions(+) 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_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/firmware.mk b/makefiles/firmware.mk index 3ad13088b..0d742c37d 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -154,6 +154,10 @@ $(error Config $(CONFIG) references board $(BOARD), but no board definition file endif export BOARD 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)) # -- cgit v1.2.3