From 14d491c3bd06ff0bc50676db8dfd1893027f81fd Mon Sep 17 00:00:00 2001
From: Simon John <git@the-jedi.co.uk>
Date: Wed, 3 Jul 2013 09:29:34 +0200
Subject: [PATCH] moved reset routines down past where we define CATERINA

my understanding of recursively expanded variables wasn't correct
---
 arduino-mk/Arduino.mk | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 1e80e79..25dfd66 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -447,25 +447,6 @@ else
     $(call show_config_variable,USER_LIB_PATH,[USER])
 endif
 
-########################################################################
-# Reset
-#
-ifndef RESET_CMD
-    ifneq ($(CATERINA),)
-       RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino --caterina \
-          $(ARD_RESET_OPTS) $(call get_arduino_port)
-    else
-       RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino \
-          $(ARD_RESET_OPTS) $(call get_arduino_port)
-    endif
-endif
-
-ifneq ($(CATERINA),)
-    ERROR_ON_LEONARDO = $(error On Leonardo, raw_xxx operation is not supported)
-else
-    ERROR_ON_LEONARDO =
-endif
-
 
 ########################################################################
 # boards.txt parsing
@@ -563,6 +544,27 @@ else
     $(call show_config_variable,OBJDIR,[USER])
 endif
 
+
+########################################################################
+# Reset
+#
+ifndef RESET_CMD
+    ifneq ($(CATERINA),)
+       RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino --caterina \
+          $(ARD_RESET_OPTS) $(call get_arduino_port)
+    else
+       RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino \
+          $(ARD_RESET_OPTS) $(call get_arduino_port)
+    endif
+endif
+
+ifneq ($(CATERINA),)
+    ERROR_ON_LEONARDO = $(error On Leonardo, raw_xxx operation is not supported)
+else
+    ERROR_ON_LEONARDO =
+endif
+
+
 ########################################################################
 # Local sources
 #