aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2015-03-28 16:10:06 +0000
committerSimon John <git@the-jedi.co.uk>2015-03-28 16:10:06 +0000
commitf42a7e6508ffb1b5462847015be992a714533568 (patch)
treed726e616099364080e5fddb86237ff8bcd1ad4a7 /Arduino.mk
parent861d2ff72f9597c5ca0e486437a7c73f3262cc69 (diff)
Added support for VARIANT in submenu's
Also added a note that in certain 1.6 cores (attiny) F_CPU is a submenu item e.g. attiny.menu.clock.internal1.build.f_cpu=1000000L
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 3b4d246..768aaf6 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -577,7 +577,14 @@ ifeq ($(strip $(NO_CORE)),)
# Which variant ? This affects the include path
ifndef VARIANT
- VARIANT = $(call PARSE_BOARD,$(BOARD_TAG),build.variant)
+ VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),build.variant)
+ ifndef VARIANT
+ # might be a submenu
+ VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),menu.cpu.$(BOARD_SUB).build.variant)
+ endif
+ $(call show_config_variable,VARIANT,[COMPUTED],(from build.variant))
+ else
+ $(call show_config_variable,VARIANT,[USER])
endif
# see if we are a caterina device like leonardo or micro