aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2014-02-08 01:45:44 +0000
committerSudar <sudar@sudarmuthu.com>2014-02-08 09:59:50 +0530
commitff103b244ccd1a037105c2ba722ef6f2b9bbccce (patch)
treea99786dca693f8d998cbe779774e9bc7bed54fb0
parent0b954ab5a566c148badde04bd6652d2dfac07f33 (diff)
Add "gpio" to the list of isp's that don't have a port
The gpio programmer type is used on the raspberry pi to upload using the gpio spi pins via a sysfs interface, with a modified avrdude Fix #165 Fix #166
-rw-r--r--Arduino.mk2
-rw-r--r--HISTORY.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 7c06094..02efc4b 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1075,7 +1075,7 @@ endif
AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE)
-ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny))
+ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny gpio))
AVRDUDE_ISP_OPTS += -P $(call get_isp_port)
endif
diff --git a/HISTORY.md b/HISTORY.md
index 7d0eaa2..2a6c5a5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,6 +7,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
### 1.3.2 (in development)
- Fix: Add arduino-mk-vars.md file to RPM SPECfile. (https://github.com/sej7278)
- Fix: Add avr-libc/malloc.c and realloc.c to included core files. Fixes issue #163 (https://github.com/sej7278)
+- Fix: Add "gpio" to the list of isp that don't have a port. (Issue #165, #166) (@sej7278)
### 1.3.1 (2014-02-04)
- Fix: BUNDLED_AVR_TOOLS_DIR is now set properly when using only arduino-core and not the whole arduino package. (https://github.com/sej7278)