[gnoduino: 47/237] http://code.google.com/p/arduino/issues/detail?id=517

[Lucian Langa <lucilanga src gnome org>]

commit 487b186cbaa345c523ff8863e48ed888f840d538
Author: WestfW <westfw gmail com>
Date:   Thu Jun 9 22:57:27 2011 -0700

    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

 arduino/bootloaders/optiboot/Makefile |   81 ++++++++++++++++++++++-----------
 1 files changed, 54 insertions(+), 27 deletions(-)
---
diff --git a/arduino/bootloaders/optiboot/Makefile b/arduino/bootloaders/optiboot/Makefile
index 92f9c61..0f8d09e 100644
--- a/arduino/bootloaders/optiboot/Makefile
+++ b/arduino/bootloaders/optiboot/Makefile
@@ -136,9 +136,12 @@ pro20: $(PROGRAM)_pro_20mhz.lst
 
 pro20_isp: pro20
 pro20_isp: TARGET = pro_20mhz
-pro20_isp: HFUSE = DD # 2.7V brownout
-pro20_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
-pro20_isp: EFUSE = 02 # 512 byte boot
+# 2.7V brownout
+pro20_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro20_isp: LFUSE = C6
+# 512 byte boot
+pro20_isp: EFUSE = 02
 pro20_isp: isp
 
 # 16MHz clocked platforms
@@ -154,9 +157,12 @@ pro16: $(PROGRAM)_pro_16MHz.lst
 
 pro16_isp: pro16
 pro16_isp: TARGET = pro_16MHz
-pro16_isp: HFUSE = DD # 2.7V brownout
-pro16_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
-pro16_isp: EFUSE = 02 # 512 byte boot
+# 2.7V brownout
+pro16_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro16_isp: LFUSE = C6
+# 512 byte boot
+pro16_isp: EFUSE = 02
 pro16_isp: isp
 
 # Diecimila and NG use identical bootloaders
@@ -169,9 +175,12 @@ diecimila: $(PROGRAM)_diecimila.lst
 
 diecimila_isp: diecimila
 diecimila_isp: TARGET = diecimila
-diecimila_isp: HFUSE = DD # 2.7V brownout
-diecimila_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
-diecimila_isp: EFUSE = 02 # 512 byte boot
+# 2.7V brownout
+diecimila_isp: HFUSE = DD
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+diecimila_isp: LFUSE = FF
+# 512 byte boot
+diecimila_isp: EFUSE = 02
 diecimila_isp: isp
 
 atmega328: TARGET = atmega328
@@ -185,9 +194,12 @@ atmega328: $(PROGRAM)_atmega328.lst
 atmega328_isp: atmega328
 atmega328_isp: TARGET = atmega328
 atmega328_isp: MCU_TARGET = atmega328p
-atmega328_isp: HFUSE = DE # 512 byte boot
-atmega328_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
-atmega328_isp: EFUSE = 05 # 2.7V brownout
+# 512 byte boot
+atmega328_isp: HFUSE = DE
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega328_isp: LFUSE = FF
+# 2.7V brownout
+atmega328_isp: EFUSE = 05
 atmega328_isp: isp
 
 # 8MHz clocked platforms
@@ -203,9 +215,12 @@ lilypad: $(PROGRAM)_lilypad.lst
 
 lilypad_isp: lilypad
 lilypad_isp: TARGET = lilypad
-lilypad_isp: HFUSE = DD # 2.7V brownout
-lilypad_isp: LFUSE = E2 # Internal 8MHz osc (8MHz) Slow rising power
-lilypad_isp: EFUSE = 02 # 512 byte boot
+# 2.7V brownout
+lilypad_isp: HFUSE = DD
+# Internal 8MHz osc (8MHz) Slow rising power
+lilypad_isp: LFUSE = E2
+# 512 byte boot
+lilypad_isp: EFUSE = 02
 lilypad_isp: isp
 
 lilypad_resonator: TARGET = lilypad_resonator
@@ -216,9 +231,12 @@ lilypad_resonator: $(PROGRAM)_lilypad_resonator.lst
 
 lilypad_resonator_isp: lilypad_resonator
 lilypad_resonator_isp: TARGET = lilypad_resonator
-lilypad_resonator_isp: HFUSE = DD # 2.7V brownout
-lilypad_resonator_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
-lilypad_resonator_isp: EFUSE = 02 # 512 byte boot
+# 2.7V brownout
+lilypad_resonator_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+lilypad_resonator_isp: LFUSE = C6
+# 512 byte boot
+lilypad_resonator_isp: EFUSE = 02
 lilypad_resonator_isp: isp
 
 pro8: TARGET = pro_8MHz
@@ -229,9 +247,12 @@ pro8: $(PROGRAM)_pro_8MHz.lst
 
 pro8_isp: pro8
 pro8_isp: TARGET = pro_8MHz
-pro8_isp: HFUSE = DD # 2.7V brownout
-pro8_isp: LFUSE = C6 # Full swing xtal (20MHz) 258CK/14CK+4.1ms
-pro8_isp: EFUSE = 02 # 512 byte boot
+# 2.7V brownout
+pro8_isp: HFUSE = DD
+# Full swing xtal (20MHz) 258CK/14CK+4.1ms
+pro8_isp: LFUSE = C6
+# 512 byte boot
+pro8_isp: EFUSE = 02
 pro8_isp: isp
 
 atmega328_pro8: TARGET = atmega328_pro_8MHz
@@ -245,9 +266,12 @@ atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.lst
 atmega328_pro8_isp: atmega328_pro8
 atmega328_pro8_isp: TARGET = atmega328_pro_8MHz
 atmega328_pro8_isp: MCU_TARGET = atmega328p
-atmega328_pro8_isp: HFUSE = DE # 512 byte boot
-atmega328_pro8_isp: LFUSE = FF # Low power xtal (16MHz) 16KCK/14CK+65ms
-atmega328_pro8_isp: EFUSE = 05 # 2.7V brownout
+# 512 byte boot
+atmega328_pro8_isp: HFUSE = DE
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega328_pro8_isp: LFUSE = FF
+# 2.7V brownout
+atmega328_pro8_isp: EFUSE = 05
 atmega328_pro8_isp: isp
 
 # 1MHz clocked platforms
@@ -267,9 +291,12 @@ luminet: $(PROGRAM)_luminet.lst
 luminet_isp: luminet
 luminet_isp: TARGET = luminet
 luminet_isp: MCU_TARGET = attiny84
-luminet_isp: HFUSE = DF # Brownout disabled
-luminet_isp: LFUSE = 62 # 1MHz internal oscillator, slowly rising power
-luminet_isp: EFUSE = FE # Self-programming enable
+# Brownout disabled
+luminet_isp: HFUSE = DF
+# 1MHz internal oscillator, slowly rising power
+luminet_isp: LFUSE = 62
+# Self-programming enable
+luminet_isp: EFUSE = FE
 luminet_isp: isp
 
 isp: $(TARGET)