aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2013-10-05 08:19:58 +0530
committerSudar <sudar@sudarmuthu.com>2013-10-06 17:43:03 +0530
commit9ff2b2e4d66e31677118becb2f83a52ce0e97184 (patch)
tree643c4af821d8e023a38fde3b1e36c37792109a1f
parent9c22972b98089e47251a4dcd0e570de0fcb4b8a6 (diff)
Don't append port details to avrdude for usbasp
When usbasp is used as programmer, there is no need to specify the port to avrdude. Fix #123
-rw-r--r--HISTORY.md3
-rw-r--r--arduino-mk/Arduino.mk6
2 files changed, 8 insertions, 1 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 170b61a..1a0b4ac 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -4,6 +4,9 @@ A Makefile for Arduino Sketches
The following is the rough list of changes that went into different versions.
I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
+### 1.1.0 (in development)
+- Don't append port details to avrdude for usbasp. See #123
+
### 1.0.1 (2013-09-25)
- Unconditionally add -D in avrdude options. See #114
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 1862548..f3584ae 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -1011,7 +1011,11 @@ ifndef AVRDUDE_ISP_FUSES_POST
endif
endif
-AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE) -P $(call get_isp_port)
+AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE)
+
+ifneq ($(strip $(ISP_PROG)),usbasp)
+ AVRDUDE_ISP_OPTS += -P $(call get_isp_port)
+endif
ifndef ISP_EEPROM
ISP_EEPROM = 0