aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstepcut <jeremy@n-heptane.com>2014-10-13 19:57:24 -0500
committerstepcut <jeremy@n-heptane.com>2014-10-13 19:57:24 -0500
commit969a468bedea20af7d536683feb934212472e843 (patch)
tree51688bedf274b339432b149de11f954968e992c7
parente42d91ed4f0184347b03954b7ff8290b1bada9de (diff)
minor tweaks to Teensy.mk
-rw-r--r--Teensy.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/Teensy.mk b/Teensy.mk
index 9c3c41a..43de891 100644
--- a/Teensy.mk
+++ b/Teensy.mk
@@ -44,6 +44,15 @@ ifndef CXX_NAME
endif
endif
+ifndef AS_NAME
+ AS_NAME := $(call PARSE_TEENSY,$(BOARD_TAG),build.command.as)
+ ifndef AS_NAME
+ AS_NAME := arm-none-eabi-gcc-as
+ else
+ $(call show_config_variable,AS_NAME,[COMPUTED])
+ endif
+endif
+
ifndef OBJCOPY_NAME
OBJCOPY_NAME := $(call PARSE_TEENSY,$(BOARD_TAG),build.command.objcopy)
ifndef OBJCOPY_NAME
@@ -83,7 +92,7 @@ endif
ifndef NM_NAME
NM_NAME := $(call PARSE_TEENSY,$(BOARD_TAG),build.command.nm)
ifndef NM_NAME
- NM_NAME := avr-nm
+ NM_NAME := arm-none-eabi-gcc-nm
else
$(call show_config_variable,NM_NAME,[COMPUTED])
endif
@@ -94,10 +103,6 @@ ifndef MCU
MCU := $(call PARSE_TEENSY,$(BOARD_TAG),build.cpu)
ifndef MCU
MCU := $(call PARSE_TEENSY,$(BOARD_TAG),build.mcu)
- ifndef MCU
- # might be a submenu
- MCU := $(call PARSE_TEENSY,$(BOARD_TAG),menu.cpu.$(BOARD_SUB).build.mcu)
- endif
else
MCU_FLAG_NAME=mcpu
endif