aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2014-10-24 09:03:17 +0530
committerSudar <sudar@sudarmuthu.com>2014-10-24 09:03:17 +0530
commit73f08aad76fc01efa80c80aa7ff2bf328ad34cee (patch)
treeba81526670d271f4c16d867fa217c855dfbb4ef9 /Arduino.mk
parent3eee9851bb176d0695d3dd091d6ebf8412ac382f (diff)
parenta2c8fe51968cf6588217d3187a674d1c44d506f0 (diff)
Merge pull request #282 from sej7278/master
Add "avrispmkii" to the list of ISP's that don't have a port. Fix #279
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 0cdb783..1e840bf 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1287,7 +1287,7 @@ endif
AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE)
ifndef $(ISP_PORT)
- ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny gpio))
+ ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny gpio avrispmkii))
AVRDUDE_ISP_OPTS += -P $(call get_isp_port)
endif
else