From da99f5f28369df07ff109aabeb6472f051a23d38 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@galois.com>
Date: Tue, 11 Dec 2012 15:19:34 -0800
Subject: [PATCH] Arduino.mk: compile with CONFIG_HAL_BOARD define from the
 user's config.mk

---
 libraries/AP_Common/Arduino.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk
index 6113a2caa8..2dd737e05e 100644
--- a/libraries/AP_Common/Arduino.mk
+++ b/libraries/AP_Common/Arduino.mk
@@ -229,6 +229,7 @@ endif
 # Tool options
 #
 DEFINES			=	-DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERS) $(EXTRAFLAGS) 
+EXTRAFLAGS      =
 OPTFLAGS		=	-Os -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wformat=2 -Wno-reorder
 DEPFLAGS		=	-MD -MT $@
 
@@ -397,7 +398,11 @@ else
 #if EXCLUDE_CORE is nonempty (true), set COREINCLUDES and CORELIBOBJS to empty
 COREINCLUDES :=
 CORELIBOBJS := 
-EXTRAFLAGS := -DEXCLUDECORE
+EXTRAFLAGS += -DEXCLUDECORE
+endif
+
+ifneq ($(HAL_BOARD),)
+EXTRAFLAGS += -DCONFIG_HAL_BOARD=$(HAL_BOARD)
 endif
 
 ################################################################################