From 6ef2b394f95473da8e2bca62576d659d048a3ca8 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Wed, 9 Mar 2011 17:28:24 -0300
Subject: [PATCH] avrdude/: fixed confusing typo in avrdude.conf, added
 tuxbrain's nanonote_ICSP

- nanonote-nxuart.patch (avrdude.conf): typo, CMD is signal 6, not 5 (by
  David Reyes Samblas Martinez)
- series, nanonote-icsp.patch (avrdude.conf): NanoNote ICSP 8:10 cable,
  by David Reyes Samblas Martinez
---
 avrdude/patches/nanonote-icsp.patch   | 21 +++++++++++++++++++++
 avrdude/patches/nanonote-nxuart.patch |  6 +++---
 avrdude/patches/series                |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 avrdude/patches/nanonote-icsp.patch

diff --git a/avrdude/patches/nanonote-icsp.patch b/avrdude/patches/nanonote-icsp.patch
new file mode 100644
index 0000000..28a6709
--- /dev/null
+++ b/avrdude/patches/nanonote-icsp.patch
@@ -0,0 +1,21 @@
+Index: avrdude/avrdude-5.10/avrdude.conf.in
+===================================================================
+--- avrdude.orig/avrdude-5.10/avrdude.conf.in	2011-03-09 17:21:53.000000000 -0300
++++ avrdude/avrdude-5.10/avrdude.conf.in	2011-03-09 17:23:04.000000000 -0300
+@@ -626,6 +626,16 @@
+   pgmled = 2;
+ ;
+ 
++programmer
++  id	= "nanonote_ICSP";
++  desc	= "NanoNote ICSP 8:10 cable";
++  type	= nanonote;
++  reset	= 8;
++  sck	= 7;
++  mosi	= 2;
++  miso	= 6;
++;
++
+ @HAVE_PARPORT_BEGIN@  Inclusion of the following depends on --enable-parport
+ # Parallel port programmers.
+ 
diff --git a/avrdude/patches/nanonote-nxuart.patch b/avrdude/patches/nanonote-nxuart.patch
index a4c4cfd..098a040 100644
--- a/avrdude/patches/nanonote-nxuart.patch
+++ b/avrdude/patches/nanonote-nxuart.patch
@@ -1,7 +1,7 @@
 Index: avrdude/avrdude-5.10/avrdude.conf.in
 ===================================================================
---- avrdude.orig/avrdude-5.10/avrdude.conf.in	2011-02-04 17:26:06.000000000 -0300
-+++ avrdude/avrdude-5.10/avrdude.conf.in	2011-02-04 17:26:07.000000000 -0300
+--- avrdude.orig/avrdude-5.10/avrdude.conf.in	2011-03-09 17:13:57.000000000 -0300
++++ avrdude/avrdude-5.10/avrdude.conf.in	2011-03-09 17:19:28.000000000 -0300
 @@ -592,6 +592,29 @@
    type  = avr910;
  ;
@@ -14,7 +14,7 @@ Index: avrdude/avrdude-5.10/avrdude.conf.in
 +# VSS   -
 +# CLK   - (reserved for clock output)
 +# VDD   -
-+# CMD   5
++# CMD   6
 +# DAT3  7
 +# DAT2  8
 +#
diff --git a/avrdude/patches/series b/avrdude/patches/series
index 5e07046..22c9ab7 100644
--- a/avrdude/patches/series
+++ b/avrdude/patches/series
@@ -4,3 +4,4 @@ nanonote.patch
 nanonote-nxuart.patch
 nanonote-atusb.patch
 atmega32u2.patch
+nanonote-icsp.patch