Skip to content

Commit 6840b77

Browse files
WestfWWestfW
committed
http://code.google.com/p/arduino/issues/detail?id=517
Remove the trailing comments when setting fuse values for the various *_isp targets, so that they won't cause avrdude errors. This was done the same way as in the optiboot source tree: http://code.google.com/p/optiboot/issues/detail?id=17 http://code.google.com/p/optiboot/source/detail?r=005fb033fc08c551b2f86f7c90c5db21549b3f20
1 parent 2d2ed32 commit 6840b77

File tree

1 file changed

+54
-27
lines changed
  • hardware/arduino/bootloaders/optiboot

1 file changed

+54
-27
lines changed

‎hardware/arduino/bootloaders/optiboot/Makefile

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,12 @@ pro20: $(PROGRAM)_pro_20mhz.lst
136136

137137
pro20_isp: pro20
138138
pro20_isp: TARGET = pro_20mhz
139-
pro20_isp: HFUSE = DD # 2.7V brownout
140-
pro20_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
141-
pro20_isp: EFUSE = 02 # 512 byte boot
139+
# 2.7V brownout
140+
pro20_isp: HFUSE = DD
141+
# Full swing xtal (20MHz) 258CK/14CK+4.1ms
142+
pro20_isp: LFUSE = C6
143+
# 512 byte boot
144+
pro20_isp: EFUSE = 02
142145
pro20_isp: isp
143146

144147
# 16MHz clocked platforms
@@ -154,9 +157,12 @@ pro16: $(PROGRAM)_pro_16MHz.lst
154157

155158
pro16_isp: pro16
156159
pro16_isp: TARGET = pro_16MHz
157-
pro16_isp: HFUSE = DD # 2.7V brownout
158-
pro16_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
159-
pro16_isp: EFUSE = 02 # 512 byte boot
160+
# 2.7V brownout
161+
pro16_isp: HFUSE = DD
162+
# Full swing xtal (20MHz) 258CK/14CK+4.1ms
163+
pro16_isp: LFUSE = C6
164+
# 512 byte boot
165+
pro16_isp: EFUSE = 02
160166
pro16_isp: isp
161167

162168
# Diecimila and NG use identical bootloaders
@@ -169,9 +175,12 @@ diecimila: $(PROGRAM)_diecimila.lst
169175

170176
diecimila_isp: diecimila
171177
diecimila_isp: TARGET = diecimila
172-
diecimila_isp: HFUSE = DD # 2.7V brownout
173-
diecimila_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
174-
diecimila_isp: EFUSE = 02 # 512 byte boot
178+
# 2.7V brownout
179+
diecimila_isp: HFUSE = DD
180+
# Low power xtal (16MHz) 16KCK/14CK+65ms
181+
diecimila_isp: LFUSE = FF
182+
# 512 byte boot
183+
diecimila_isp: EFUSE = 02
175184
diecimila_isp: isp
176185

177186
atmega328: TARGET = atmega328
@@ -185,9 +194,12 @@ atmega328: $(PROGRAM)_atmega328.lst
185194
atmega328_isp: atmega328
186195
atmega328_isp: TARGET = atmega328
187196
atmega328_isp: MCU_TARGET = atmega328p
188-
atmega328_isp: HFUSE = DE # 512 byte boot
189-
atmega328_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
190-
atmega328_isp: EFUSE = 05 # 2.7V brownout
197+
# 512 byte boot
198+
atmega328_isp: HFUSE = DE
199+
# Low power xtal (16MHz) 16KCK/14CK+65ms
200+
atmega328_isp: LFUSE = FF
201+
# 2.7V brownout
202+
atmega328_isp: EFUSE = 05
191203
atmega328_isp: isp
192204

193205
# 8MHz clocked platforms
@@ -203,9 +215,12 @@ lilypad: $(PROGRAM)_lilypad.lst
203215

204216
lilypad_isp: lilypad
205217
lilypad_isp: TARGET = lilypad
206-
lilypad_isp: HFUSE = DD # 2.7V brownout
207-
lilypad_isp: LFUSE = E2 # Internal 8MHz osc (8MHz) Slow rising power
208-
lilypad_isp: EFUSE = 02 # 512 byte boot
218+
# 2.7V brownout
219+
lilypad_isp: HFUSE = DD
220+
# Internal 8MHz osc (8MHz) Slow rising power
221+
lilypad_isp: LFUSE = E2
222+
# 512 byte boot
223+
lilypad_isp: EFUSE = 02
209224
lilypad_isp: isp
210225

211226
lilypad_resonator: TARGET = lilypad_resonator
@@ -216,9 +231,12 @@ lilypad_resonator: $(PROGRAM)_lilypad_resonator.lst
216231

217232
lilypad_resonator_isp: lilypad_resonator
218233
lilypad_resonator_isp: TARGET = lilypad_resonator
219-
lilypad_resonator_isp: HFUSE = DD # 2.7V brownout
220-
lilypad_resonator_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
221-
lilypad_resonator_isp: EFUSE = 02 # 512 byte boot
234+
# 2.7V brownout
235+
lilypad_resonator_isp: HFUSE = DD
236+
# Full swing xtal (20MHz) 258CK/14CK+4.1ms
237+
lilypad_resonator_isp: LFUSE = C6
238+
# 512 byte boot
239+
lilypad_resonator_isp: EFUSE = 02
222240
lilypad_resonator_isp: isp
223241

224242
pro8: TARGET = pro_8MHz
@@ -229,9 +247,12 @@ pro8: $(PROGRAM)_pro_8MHz.lst
229247

230248
pro8_isp: pro8
231249
pro8_isp: TARGET = pro_8MHz
232-
pro8_isp: HFUSE = DD # 2.7V brownout
233-
pro8_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
234-
pro8_isp: EFUSE = 02 # 512 byte boot
250+
# 2.7V brownout
251+
pro8_isp: HFUSE = DD
252+
# Full swing xtal (20MHz) 258CK/14CK+4.1ms
253+
pro8_isp: LFUSE = C6
254+
# 512 byte boot
255+
pro8_isp: EFUSE = 02
235256
pro8_isp: isp
236257

237258
atmega328_pro8: TARGET = atmega328_pro_8MHz
@@ -245,9 +266,12 @@ atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.lst
245266
atmega328_pro8_isp: atmega328_pro8
246267
atmega328_pro8_isp: TARGET = atmega328_pro_8MHz
247268
atmega328_pro8_isp: MCU_TARGET = atmega328p
248-
atmega328_pro8_isp: HFUSE = DE # 512 byte boot
249-
atmega328_pro8_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
250-
atmega328_pro8_isp: EFUSE = 05 # 2.7V brownout
269+
# 512 byte boot
270+
atmega328_pro8_isp: HFUSE = DE
271+
# Low power xtal (16MHz) 16KCK/14CK+65ms
272+
atmega328_pro8_isp: LFUSE = FF
273+
# 2.7V brownout
274+
atmega328_pro8_isp: EFUSE = 05
251275
atmega328_pro8_isp: isp
252276

253277
# 1MHz clocked platforms
@@ -267,9 +291,12 @@ luminet: $(PROGRAM)_luminet.lst
267291
luminet_isp: luminet
268292
luminet_isp: TARGET = luminet
269293
luminet_isp: MCU_TARGET = attiny84
270-
luminet_isp: HFUSE = DF # Brownout disabled
271-
luminet_isp: LFUSE = 62 # 1MHz internal oscillator, slowly rising power
272-
luminet_isp: EFUSE = FE # Self-programming enable
294+
# Brownout disabled
295+
luminet_isp: HFUSE = DF
296+
# 1MHz internal oscillator, slowly rising power
297+
luminet_isp: LFUSE = 62
298+
# Self-programming enable
299+
luminet_isp: EFUSE = FE
273300
luminet_isp: isp
274301

275302
isp: $(TARGET)

0 commit comments

Comments
 (0)