mirror of
git://projects.qi-hardware.com/ben-blinkenlights.git
synced 2025-04-21 12:27:27 +03:00
avrdude/: upgrade from avrdude-5.10 to avrdude-5.11.1
Only one trivial context mismatch. Plus a refresh of all the patches.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
Index: avrdude/avrpart.h
|
||||
Index: avrdude-5.11.1/avrpart.h
|
||||
===================================================================
|
||||
--- avrdude.orig/avrpart.h 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/avrpart.h 2011-03-08 23:40:13.000000000 -0300
|
||||
@@ -185,6 +185,8 @@
|
||||
--- avrdude-5.11.1.orig/avrpart.h 2012-07-22 10:29:39.275651769 -0300
|
||||
+++ avrdude-5.11.1/avrpart.h 2012-07-22 10:29:41.387721159 -0300
|
||||
@@ -186,6 +186,8 @@
|
||||
|
||||
unsigned char * buf; /* pointer to memory buffer */
|
||||
OPCODE * op[AVR_OP_MAX]; /* opcodes */
|
||||
@@ -11,11 +11,11 @@ Index: avrdude/avrpart.h
|
||||
} AVRMEM;
|
||||
|
||||
#ifdef __cplusplus
|
||||
Index: avrdude/config_gram.y
|
||||
Index: avrdude-5.11.1/config_gram.y
|
||||
===================================================================
|
||||
--- avrdude.orig/config_gram.y 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/config_gram.y 2011-03-08 23:40:13.000000000 -0300
|
||||
@@ -1209,6 +1209,7 @@
|
||||
--- avrdude-5.11.1.orig/config_gram.y 2012-07-22 10:29:39.287652163 -0300
|
||||
+++ avrdude-5.11.1/config_gram.y 2012-07-22 10:29:41.391721290 -0300
|
||||
@@ -1297,6 +1297,7 @@
|
||||
}
|
||||
mem_specs
|
||||
{
|
||||
@@ -23,10 +23,10 @@ Index: avrdude/config_gram.y
|
||||
ladd(current_part->mem, current_mem);
|
||||
current_mem = NULL;
|
||||
} |
|
||||
Index: avrdude/fileio.c
|
||||
Index: avrdude-5.11.1/fileio.c
|
||||
===================================================================
|
||||
--- avrdude.orig/fileio.c 2011-03-08 23:40:10.000000000 -0300
|
||||
+++ avrdude/fileio.c 2011-03-08 23:40:13.000000000 -0300
|
||||
--- avrdude-5.11.1.orig/fileio.c 2012-07-22 10:29:39.263651374 -0300
|
||||
+++ avrdude-5.11.1/fileio.c 2012-07-22 10:29:41.391721290 -0300
|
||||
@@ -52,7 +52,7 @@
|
||||
char * outfile, FILE * outf);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user