Skip to content

Commit 4bcd0ea

Browse files
dl8dtldl8dtl
committed
Fix a number of mistakes in avrdude.conf.in
Stefan Rueger found a lot of mistakes in this file. Closes avrdudes#915
1 parent 08ad5ea commit 4bcd0ea

File tree

2 files changed

+147
-18
lines changed

2 files changed

+147
-18
lines changed

‎NEWS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ Changes since version 6.4:
8888
where the EDBG AVRISP 'Enter Programming Mode' command fails #900
8989
- Terminal write mode doesn't support string input (yet) #913
9090
- Terminal mode: memory fill with strings may cause Avrdude to crash. #922
91+
- Some parts have wrong or missing ISP commands #915
9192

9293
* Pull requests:
9394

‎src/avrdude.conf.in‎

Lines changed: 146 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4741,16 +4741,79 @@ part parent "m324p"
47414741
signature = 0x1e 0x94 0x0a;
47424742

47434743
memory "eeprom"
4744+
paged = no; /* leave this "no" */
47444745
size = 512;
47454746
page_size = 4;
4746-
;
4747+
min_write_delay = 9000;
4748+
max_write_delay = 9000;
4749+
readback_p1 = 0xff;
4750+
readback_p2 = 0xff;
4751+
read = " 1 0 1 0 0 0 0 0",
4752+
" 0 0 x x x a10 a9 a8",
4753+
" a7 a6 a5 a4 a3 a2 a1 a0",
4754+
" o o o o o o o o";
4755+
4756+
write = " 1 1 0 0 0 0 0 0",
4757+
" 0 0 x x x a10 a9 a8",
4758+
" a7 a6 a5 a4 a3 a2 a1 a0",
4759+
" i i i i i i i i";
4760+
4761+
loadpage_lo = " 1 1 0 0 0 0 0 1",
4762+
" 0 0 0 0 0 0 0 0",
4763+
" 0 0 0 0 0 0 a1 a0",
4764+
" i i i i i i i i";
4765+
4766+
writepage = " 1 1 0 0 0 0 1 0",
4767+
" 0 0 x x x a10 a9 a8",
4768+
" a7 a6 a5 a4 a3 a2 0 0",
4769+
" x x x x x x x x";
4770+
4771+
mode = 0x41;
4772+
delay = 10;
4773+
blocksize = 128;
4774+
readsize = 256;
4775+
;
47474776

47484777
memory "flash"
47494778
paged = yes;
47504779
size = 16384;
47514780
page_size = 128;
47524781
num_pages = 128;
4782+
min_write_delay = 4500;
4783+
max_write_delay = 4500;
4784+
readback_p1 = 0xff;
4785+
readback_p2 = 0xff;
4786+
read_lo = " 0 0 1 0 0 0 0 0",
4787+
" 0 a14 a13 a12 a11 a10 a9 a8",
4788+
" a7 a6 a5 a4 a3 a2 a1 a0",
4789+
" o o o o o o o o";
4790+
4791+
read_hi = " 0 0 1 0 1 0 0 0",
4792+
" 0 a14 a13 a12 a11 a10 a9 a8",
4793+
" a7 a6 a5 a4 a3 a2 a1 a0",
4794+
" o o o o o o o o";
4795+
4796+
loadpage_lo = " 0 1 0 0 0 0 0 0",
4797+
" 0 0 x x x x x x",
4798+
" x x a5 a4 a3 a2 a1 a0",
4799+
" i i i i i i i i";
4800+
4801+
loadpage_hi = " 0 1 0 0 1 0 0 0",
4802+
" 0 0 x x x x x x",
4803+
" x x a5 a4 a3 a2 a1 a0",
4804+
" i i i i i i i i";
4805+
4806+
writepage = " 0 1 0 0 1 1 0 0",
4807+
" 0 a14 a13 a12 a11 a10 a9 a8",
4808+
" a7 a6 x x x x x x",
4809+
" x x x x x x x x";
4810+
4811+
mode = 0x21;
4812+
delay = 6;
4813+
blocksize = 256;
4814+
readsize = 256;
47534815
;
4816+
47544817
;
47554818

47564819
#------------------------------------------------------------
@@ -5907,7 +5970,7 @@ part
59075970
" i i i i i i i i";
59085971

59095972
writepage = " 0 1 0 0 1 1 0 0",
5910-
" x x x a12 a11 a10 a9 a8",
5973+
" x a14 a13 a12 a11 a10 a9 a8",
59115974
" a7 a6 x x x x x x",
59125975
" x x x x x x x x";
59135976

@@ -6161,7 +6224,7 @@ part
61616224
" i i i i i i i i";
61626225

61636226
writepage = " 0 1 0 0 1 1 0 0",
6164-
" x x x a12 a11 a10 a9 a8",
6227+
"a15 a14 a13 a12 a11 a10 a9 a8",
61656228
" a7 x x x x x x x",
61666229
" x x x x x x x x";
61676230

@@ -8846,16 +8909,16 @@ part
88468909
"a7 a6 a5 a4 a3 a2 a1 a0 o o o o o o o o";
88478910

88488911
write = "1 1 0 0 0 0 0 0 0 0 x x x x x a8",
8849-
"a8 a6 a5 a4 a3 a2 a1 a0 i i i i i i i i";
8912+
"a7 a6 a5 a4 a3 a2 a1 a0 i i i i i i i i";
88508913

88518914
loadpage_lo = " 1 1 0 0 0 0 0 1",
88528915
" 0 0 0 0 0 0 0 0",
88538916
" 0 0 0 0 0 0 a1 a0",
88548917
" i i i i i i i i";
88558918

88568919
writepage = " 1 1 0 0 0 0 1 0",
8857-
" 0 0 x x x x x x",
8858-
" 0 0 a5 a4 a3 a2 0 0",
8920+
" 0 0 x x x x x a8",
8921+
" a7 a6 a5 a4 a3 a2 0 0",
88598922
" x x x x x x x x";
88608923

88618924
mode = 0x41;
@@ -9033,16 +9096,16 @@ part
90339096
"a7 a6 a5 a4 a3 a2 a1 a0 o o o o o o o o";
90349097

90359098
write = "1 1 0 0 0 0 0 0 0 0 x x x x x a8",
9036-
"a8 a6 a5 a4 a3 a2 a1 a0 i i i i i i i i";
9099+
"a7 a6 a5 a4 a3 a2 a1 a0 i i i i i i i i";
90379100

90389101
loadpage_lo = " 1 1 0 0 0 0 0 1",
90399102
" 0 0 0 0 0 0 0 0",
90409103
" 0 0 0 0 0 0 a1 a0",
90419104
" i i i i i i i i";
90429105

90439106
writepage = " 1 1 0 0 0 0 1 0",
9044-
" 0 0 x x x x x x",
9045-
" 0 0 a5 a4 a3 a2 0 0",
9107+
" 0 0 x x x x x a8",
9108+
" a7 a6 a5 a4 a3 a2 0 0",
90469109
" x x x x x x x x";
90479110

90489111
mode = 0x41;
@@ -9777,15 +9840,78 @@ part parent "m328"
97779840
bs2 = 0xe2;
97789841

97799842
memory "eeprom"
9843+
paged = no;
97809844
size = 2048;
97819845
page_size = 8;
9846+
min_write_delay = 3600;
9847+
max_write_delay = 3600;
9848+
readback_p1 = 0xff;
9849+
readback_p2 = 0xff;
9850+
read = " 1 0 1 0 0 0 0 0",
9851+
" 0 0 0 x x x a9 a8",
9852+
" a7 a6 a5 a4 a3 a2 a1 a0",
9853+
" o o o o o o o o";
9854+
9855+
write = " 1 1 0 0 0 0 0 0",
9856+
" 0 0 0 x x x a9 a8",
9857+
" a7 a6 a5 a4 a3 a2 a1 a0",
9858+
" i i i i i i i i";
9859+
9860+
loadpage_lo = " 1 1 0 0 0 0 0 1",
9861+
" 0 0 0 0 0 0 0 0",
9862+
" 0 0 0 0 0 0 a1 a0",
9863+
" i i i i i i i i";
9864+
9865+
writepage = " 1 1 0 0 0 0 1 0",
9866+
" 0 0 x x x x a9 a8",
9867+
" a7 a6 a5 a4 a3 a2 0 0",
9868+
" x x x x x x x x";
9869+
9870+
mode = 0x41;
9871+
delay = 20;
9872+
blocksize = 4;
9873+
readsize = 256;
97829874
;
97839875

97849876
memory "flash"
97859877
paged = yes;
97869878
size = 65536;
97879879
page_size = 256;
97889880
num_pages = 256;
9881+
min_write_delay = 4500;
9882+
max_write_delay = 4500;
9883+
readback_p1 = 0xff;
9884+
readback_p2 = 0xff;
9885+
read_lo = " 0 0 1 0 0 0 0 0",
9886+
" 0 0 a13 a12 a11 a10 a9 a8",
9887+
" a7 a6 a5 a4 a3 a2 a1 a0",
9888+
" o o o o o o o o";
9889+
9890+
read_hi = " 0 0 1 0 1 0 0 0",
9891+
" 0 0 a13 a12 a11 a10 a9 a8",
9892+
" a7 a6 a5 a4 a3 a2 a1 a0",
9893+
" o o o o o o o o";
9894+
9895+
loadpage_lo = " 0 1 0 0 0 0 0 0",
9896+
" 0 0 0 x x x x x",
9897+
" x x a5 a4 a3 a2 a1 a0",
9898+
" i i i i i i i i";
9899+
9900+
loadpage_hi = " 0 1 0 0 1 0 0 0",
9901+
" 0 0 0 x x x x x",
9902+
" x x a5 a4 a3 a2 a1 a0",
9903+
" i i i i i i i i";
9904+
9905+
writepage = " 0 1 0 0 1 1 0 0",
9906+
" 0 0 a13 a12 a11 a10 a9 a8",
9907+
" a7 a6 x x x x x x",
9908+
" x x x x x x x x";
9909+
9910+
mode = 0x41;
9911+
delay = 6;
9912+
blocksize = 128;
9913+
readsize = 256;
9914+
97899915
;
97909916

97919917
memory "efuse"
@@ -10259,7 +10385,7 @@ part
1025910385
" i i i i i i i i";
1026010386

1026110387
writepage = " 1 1 0 0 0 0 1 0",
10262-
" 0 0 x x x x x x",
10388+
" 0 0 x x x x x a8",
1026310389
" a7 a6 a5 a4 a3 a2 0 0",
1026410390
" x x x x x x x x";
1026510391

@@ -12127,7 +12253,7 @@ part
1212712253

1212812254
writepage = " 1 1 0 0 0 0 1 0",
1212912255
" 0 0 x x x x x x",
12130-
" x a6 a5 a4 a3 a2 0 0",
12256+
" a7 a6 a5 a4 a3 a2 0 0",
1213112257
" x x x x x x x x";
1213212258

1213312259
mode = 0x41;
@@ -12319,8 +12445,8 @@ part
1231912445
" i i i i i i i i";
1232012446

1232112447
writepage = " 1 1 0 0 0 0 1 0",
12322-
" 0 0 x x x x x x",
12323-
" x a6 a5 a4 a3 a2 0 0",
12448+
" 0 0 x x x x x a8",
12449+
" a7 a6 a5 a4 a3 a2 0 0",
1232412450
" x x x x x x x x";
1232512451

1232612452
mode = 0x41;
@@ -12621,7 +12747,7 @@ part
1262112747
readback_p1 = 0xff;
1262212748
readback_p2 = 0xff;
1262312749
read = "1 0 1 0 0 0 0 0 0 0 0 x x x x x",
12624-
"0 0 a4 a3 a2 a1 a0 o o o o o o o o";
12750+
"0 0 a5 a4 a3 a2 a1 a0 o o o o o o o o";
1262512751

1262612752
write = "1 1 0 0 0 0 0 0 0 0 0 x x x x x",
1262712753
"0 0 a5 a4 a3 a2 a1 a0 i i i i i i i i";
@@ -12690,6 +12816,8 @@ part
1269012816
size = 1;
1269112817
write = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
1269212818
"x x x x x x x x 1 1 i i i i i i";
12819+
read = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
12820+
"x x x x x x x x o o o o o o o o";
1269312821
min_write_delay = 4500;
1269412822
max_write_delay = 4500;
1269512823
;
@@ -13404,7 +13532,7 @@ part
1340413532
" i i i i i i i i";
1340513533

1340613534
writepage = " 1 1 0 0 0 0 1 0",
13407-
" 0 0 x x x a10 a9 a8",
13535+
" 0 0 x x a11 a10 a9 a8",
1340813536
" a7 a6 a5 a4 a3 0 0 0",
1340913537
" x x x x x x x x";
1341013538

@@ -16463,12 +16591,12 @@ part
1646316591
readback_p1 = 0xff;
1646416592
readback_p2 = 0xff;
1646516593
read_lo = " 0 0 1 0 0 0 0 0",
16466-
" 0 0 0 a12 a11 a10 a9 a8",
16594+
" 0 0 a13 a12 a11 a10 a9 a8",
1646716595
" a7 a6 a5 a4 a3 a2 a1 a0",
1646816596
" o o o o o o o o";
1646916597

1647016598
read_hi = " 0 0 1 0 1 0 0 0",
16471-
" 0 0 0 a12 a11 a10 a9 a8",
16599+
" 0 0 a13 a12 a11 a10 a9 a8",
1647216600
" a7 a6 a5 a4 a3 a2 a1 a0",
1647316601
" o o o o o o o o";
1647416602

@@ -16483,7 +16611,7 @@ part
1648316611
" i i i i i i i i";
1648416612

1648516613
writepage = " 0 1 0 0 1 1 0 0",
16486-
" 0 0 0 a12 a11 a10 a9 a8",
16614+
" 0 0 a13 a12 a11 a10 a9 a8",
1648716615
" a7 a6 x x x x x x",
1648816616
" x x x x x x x x";
1648916617

0 commit comments

Comments
 (0)