From 9024942ac13fb5c140f969d324e7caecb98bddcd Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Thu, 3 Feb 2011 21:55:00 -0300
Subject: [PATCH] uart/avrdude: moved avrdude.conf.in change for UART to
 separate patch

---
 uart/avrdude/patches/nanonote-uart.patch | 34 ++++++++++++++++++++++++
 uart/avrdude/patches/nanonote.patch      | 34 ------------------------
 uart/avrdude/patches/series              |  1 +
 3 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 uart/avrdude/patches/nanonote-uart.patch

diff --git a/uart/avrdude/patches/nanonote-uart.patch b/uart/avrdude/patches/nanonote-uart.patch
new file mode 100644
index 0000000..1073656
--- /dev/null
+++ b/uart/avrdude/patches/nanonote-uart.patch
@@ -0,0 +1,34 @@
+Index: avrdude/avrdude-5.10/avrdude.conf.in
+===================================================================
+--- avrdude.orig/avrdude-5.10/avrdude.conf.in	2011-02-03 21:08:13.000000000 -0300
++++ avrdude/avrdude-5.10/avrdude.conf.in	2011-02-03 21:16:34.000000000 -0300
+@@ -592,6 +592,29 @@
+   type  = avr910;
+ ;
+ 
++#
++# 8:10 card pin assignment:
++#
++# DAT1  1
++# DAT0  2
++# VSS   -
++# CLK   4
++# VDD   -
++# CMD   5
++# DAT3  7
++# DAT2  8
++#
++
++programmer
++  id    = "nanonote_uart";
++  desc  = "NanoNote UART 8:10 card";
++  type  = nanonote;
++  reset = 8;
++  sck   = 2;
++  mosi  = 7;
++  miso  = 1;
++;
++
+ @HAVE_PARPORT_BEGIN@  Inclusion of the following depends on --enable-parport
+ # Parallel port programmers.
+ 
diff --git a/uart/avrdude/patches/nanonote.patch b/uart/avrdude/patches/nanonote.patch
index b42ac39..f756b3b 100644
--- a/uart/avrdude/patches/nanonote.patch
+++ b/uart/avrdude/patches/nanonote.patch
@@ -374,37 +374,3 @@ Index: avrdude/avrdude-5.10/nanonote.h
 +void nanonote_initpgm(PROGRAMMER *pgm);
 +
 +#endif
-Index: avrdude/avrdude-5.10/avrdude.conf.in
-===================================================================
---- avrdude.orig/avrdude-5.10/avrdude.conf.in	2011-02-01 21:34:08.000000000 -0300
-+++ avrdude/avrdude-5.10/avrdude.conf.in	2011-02-01 21:36:11.000000000 -0300
-@@ -592,6 +592,29 @@
-   type  = avr910;
- ;
- 
-+#
-+# 8:10 card pin assignment:
-+#
-+# DAT1  1
-+# DAT0  2
-+# VSS   -
-+# CLK   -
-+# VDD   -
-+# CMD   5
-+# DAT3  7
-+# DAT2  8
-+#
-+
-+programmer
-+  id    = "nanonote_uart";
-+  desc  = "NanoNote UART 8:10 card";
-+  type  = nanonote;
-+  reset = 8;
-+  sck   = 2;
-+  mosi  = 7;
-+  miso  = 1;
-+;
-+
- @HAVE_PARPORT_BEGIN@  Inclusion of the following depends on --enable-parport
- # Parallel port programmers.
- 
diff --git a/uart/avrdude/patches/series b/uart/avrdude/patches/series
index aed4f4a..4fd06a9 100644
--- a/uart/avrdude/patches/series
+++ b/uart/avrdude/patches/series
@@ -1 +1,2 @@
 nanonote.patch
+nanonote-uart.patch