aboutsummaryrefslogtreecommitdiff
path: root/arduino-mk
diff options
context:
space:
mode:
Diffstat (limited to 'arduino-mk')
-rw-r--r--arduino-mk/Arduino.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index d2b3e62..9c1b940 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -976,11 +976,19 @@ endif
AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(call get_monitor_port)
ifndef ISP_PROG
- ISP_PROG = stk500v1
+ ifneq ($(strip $(AVRDUDE_ARD_PROGRAMMER)),)
+ ISP_PROG = $(AVRDUDE_ARD_PROGRAMMER)
+ else
+ ISP_PROG = stk500v1
+ endif
endif
ifndef AVRDUDE_ISP_BAUDRATE
- AVRDUDE_ISP_BAUDRATE = 19200
+ ifneq ($(strip $(AVRDUDE_ARD_BAUDRATE)),)
+ AVRDUDE_ISP_BAUDRATE = $(AVRDUDE_ARD_BAUDRATE)
+ else
+ AVRDUDE_ISP_BAUDRATE = 19200
+ endif
endif
# Pre fuse settings