Fixed all boards.txt definitions in AVR arch.

1 files changed, 60 insertions, 40 deletions

diff --git a/boards.txt b/boards.txt
index 85a9bf3..768e8f3 100644
--- a/boards.txt
+++ b/boards.txt
@@ -25,15 +25,16 @@ uno.build.variant=standard
 
 atmega328.name=Arduino Duemilanove w/ ATmega328
 
+atmega328.upload.tool=avrdude
 atmega328.upload.protocol=arduino
 atmega328.upload.maximum_size=30720
 atmega328.upload.speed=57600
 
+atmega328.bootloader.tool=avrdude
 atmega328.bootloader.low_fuses=0xFF
 atmega328.bootloader.high_fuses=0xDA
 atmega328.bootloader.extended_fuses=0x05
-atmega328.bootloader.path=atmega
-atmega328.bootloader.file=ATmegaBOOT_168_atmega328.hex
+atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
 atmega328.bootloader.unlock_bits=0x3F
 atmega328.bootloader.lock_bits=0x0F
 
@@ -46,15 +47,16 @@ atmega328.build.variant=standard
 
 diecimila.name=Arduino Diecimila or Duemilanove w/ ATmega168
 
+diecimila.upload.tool=avrdude
 diecimila.upload.protocol=arduino
 diecimila.upload.maximum_size=14336
 diecimila.upload.speed=19200
 
+diecimila.bootloader.tool=avrdude
 diecimila.bootloader.low_fuses=0xff
 diecimila.bootloader.high_fuses=0xdd
 diecimila.bootloader.extended_fuses=0x00
-diecimila.bootloader.path=atmega
-diecimila.bootloader.file=ATmegaBOOT_168_diecimila.hex
+diecimila.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
 diecimila.bootloader.unlock_bits=0x3F
 diecimila.bootloader.lock_bits=0x0F
 
@@ -67,15 +69,16 @@ diecimila.build.variant=standard
 
 nano328.name=Arduino Nano w/ ATmega328
 
+nano328.upload.tool=avrdude
 nano328.upload.protocol=arduino
 nano328.upload.maximum_size=30720
 nano328.upload.speed=57600
 
+nano328.bootloader.tool=avrdude
 nano328.bootloader.low_fuses=0xFF
 nano328.bootloader.high_fuses=0xDA
 nano328.bootloader.extended_fuses=0x05
-nano328.bootloader.path=atmega
-nano328.bootloader.file=ATmegaBOOT_168_atmega328.hex
+nano328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
 nano328.bootloader.unlock_bits=0x3F
 nano328.bootloader.lock_bits=0x0F
 
@@ -88,15 +91,16 @@ nano328.build.variant=eightanaloginputs
 
 nano.name=Arduino Nano w/ ATmega168
 
+nano.upload.tool=avrdude
 nano.upload.protocol=arduino
 nano.upload.maximum_size=14336
 nano.upload.speed=19200
 
+nano.bootloader.tool=avrdude
 nano.bootloader.low_fuses=0xff
 nano.bootloader.high_fuses=0xdd
 nano.bootloader.extended_fuses=0x00
-nano.bootloader.path=atmega
-nano.bootloader.file=ATmegaBOOT_168_diecimila.hex
+nano.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
 nano.bootloader.unlock_bits=0x3F
 nano.bootloader.lock_bits=0x0F
 
@@ -109,15 +113,16 @@ nano.build.variant=eightanaloginputs
 
 mega2560.name=Arduino Mega 2560 or Mega ADK
 
+mega2560.upload.tool=avrdude
 mega2560.upload.protocol=stk500v2
 mega2560.upload.maximum_size=258048
 mega2560.upload.speed=115200
 
+mega2560.bootloader.tool=avrdude
 mega2560.bootloader.low_fuses=0xFF
 mega2560.bootloader.high_fuses=0xD8
 mega2560.bootloader.extended_fuses=0xFD
-mega2560.bootloader.path=stk500v2
-mega2560.bootloader.file=stk500boot_v2_mega2560.hex
+mega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
 mega2560.bootloader.unlock_bits=0x3F
 mega2560.bootloader.lock_bits=0x0F
 
@@ -130,15 +135,16 @@ mega2560.build.variant=mega
 
 mega.name=Arduino Mega (ATmega1280)
 
+mega.upload.tool=avrdude
 mega.upload.protocol=arduino
 mega.upload.maximum_size=126976
 mega.upload.speed=57600
 
+mega.bootloader.tool=avrdude
 mega.bootloader.low_fuses=0xFF
 mega.bootloader.high_fuses=0xDA
 mega.bootloader.extended_fuses=0xF5
-mega.bootloader.path=atmega
-mega.bootloader.file=ATmegaBOOT_168_atmega1280.hex
+mega.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex
 mega.bootloader.unlock_bits=0x3F
 mega.bootloader.lock_bits=0x0F
 
@@ -177,15 +183,16 @@ leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
 
 mini328.name=Arduino Mini w/ ATmega328
 
+mini328.upload.tool=avrdude
 mini328.upload.protocol=arduino
 mini328.upload.maximum_size=28672
 mini328.upload.speed=115200
 
+mini328.bootloader.tool=avrdude
 mini328.bootloader.low_fuses=0xff
 mini328.bootloader.high_fuses=0xd8
 mini328.bootloader.extended_fuses=0x05
-mini328.bootloader.path=optiboot
-mini328.bootloader.file=optiboot_atmega328-Mini.hex
+mini328.bootloader.file=optiboot/optiboot_atmega328-Mini.hex
 mini328.bootloader.unlock_bits=0x3F
 mini328.bootloader.lock_bits=0x0F
 
@@ -198,15 +205,16 @@ mini328.build.variant=eightanaloginputs
 
 mini.name=Arduino Mini w/ ATmega168
 
+mini.upload.tool=avrdude
 mini.upload.protocol=arduino
 mini.upload.maximum_size=14336
 mini.upload.speed=19200
 
+mini.bootloader.tool=avrdude
 mini.bootloader.low_fuses=0xff
 mini.bootloader.high_fuses=0xdd
 mini.bootloader.extended_fuses=0x00
-mini.bootloader.path=atmega
-mini.bootloader.file=ATmegaBOOT_168_ng.hex
+mini.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
 mini.bootloader.unlock_bits=0x3F
 mini.bootloader.lock_bits=0x0F
 
@@ -219,15 +227,16 @@ mini.build.variant=eightanaloginputs
 
 ethernet.name=Arduino Ethernet
 
+ethernet.upload.tool=avrdude
 ethernet.upload.protocol=arduino
 ethernet.upload.maximum_size=32256
 ethernet.upload.speed=115200
 
+ethernet.bootloader.tool=avrdude
 ethernet.bootloader.low_fuses=0xff
 ethernet.bootloader.high_fuses=0xde
 ethernet.bootloader.extended_fuses=0x05
-ethernet.bootloader.path=optiboot
-ethernet.bootloader.file=optiboot_atmega328.hex
+ethernet.bootloader.file=optiboot/optiboot_atmega328.hex
 ethernet.bootloader.unlock_bits=0x3F
 ethernet.bootloader.lock_bits=0x0F
 
@@ -240,15 +249,16 @@ ethernet.build.core=arduino
 
 fio.name=Arduino Fio
 
+fio.upload.tool=avrdude
 fio.upload.protocol=arduino
 fio.upload.maximum_size=30720
 fio.upload.speed=57600
 
+fio.bootloader.tool=avrdude
 fio.bootloader.low_fuses=0xFF
 fio.bootloader.high_fuses=0xDA
 fio.bootloader.extended_fuses=0x05
-fio.bootloader.path=arduino:atmega
-fio.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+fio.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
 fio.bootloader.unlock_bits=0x3F
 fio.bootloader.lock_bits=0x0F
 
@@ -261,16 +271,17 @@ fio.build.variant=eightanaloginputs
 
 bt328.name=Arduino BT w/ ATmega328
 
+bt328.upload.tool=avrdude
 bt328.upload.protocol=arduino
 bt328.upload.maximum_size=28672
 bt328.upload.speed=19200
 bt328.upload.disable_flushing=true
 
+bt328.bootloader.tool=avrdude
 bt328.bootloader.low_fuses=0xff
 bt328.bootloader.high_fuses=0xd8
 bt328.bootloader.extended_fuses=0x05
-bt328.bootloader.path=bt
-bt328.bootloader.file=ATmegaBOOT_168_atmega328_bt.hex
+bt328.bootloader.file=bt/ATmegaBOOT_168_atmega328_bt.hex
 bt328.bootloader.unlock_bits=0x3F
 bt328.bootloader.lock_bits=0x0F
 
@@ -283,16 +294,17 @@ bt328.build.variant=eightanaloginputs
 
 bt.name=Arduino BT w/ ATmega168
 
+bt.upload.tool=avrdude
 bt.upload.protocol=arduino
 bt.upload.maximum_size=14336
 bt.upload.speed=19200
 bt.upload.disable_flushing=true
 
+bt.bootloader.tool=avrdude
 bt.bootloader.low_fuses=0xff
 bt.bootloader.high_fuses=0xdd
 bt.bootloader.extended_fuses=0x00
-bt.bootloader.path=bt
-bt.bootloader.file=ATmegaBOOT_168.hex
+bt.bootloader.file=bt/ATmegaBOOT_168.hex
 bt.bootloader.unlock_bits=0x3F
 bt.bootloader.lock_bits=0x0F
 
@@ -305,15 +317,16 @@ bt.build.variant=eightanaloginputs
 
 lilypad328.name=LilyPad Arduino w/ ATmega328
 
+lilypad328.upload.tool=avrdude
 lilypad328.upload.protocol=arduino
 lilypad328.upload.maximum_size=30720
 lilypad328.upload.speed=57600
 
+lilypad328.bootloader.tool=avrdude
 lilypad328.bootloader.low_fuses=0xFF
 lilypad328.bootloader.high_fuses=0xDA
 lilypad328.bootloader.extended_fuses=0x05
-lilypad328.bootloader.path=atmega
-lilypad328.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+lilypad328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
 lilypad328.bootloader.unlock_bits=0x3F
 lilypad328.bootloader.lock_bits=0x0F
 
@@ -326,15 +339,16 @@ lilypad328.build.variant=standard
 
 lilypad.name=LilyPad Arduino w/ ATmega168
 
+lilypad.upload.tool=avrdude
 lilypad.upload.protocol=arduino
 lilypad.upload.maximum_size=14336
 lilypad.upload.speed=19200
 
+lilypad.bootloader.tool=avrdude
 lilypad.bootloader.low_fuses=0xe2
 lilypad.bootloader.high_fuses=0xdd
 lilypad.bootloader.extended_fuses=0x00
-lilypad.bootloader.path=lilypad
-lilypad.bootloader.file=LilyPadBOOT_168.hex
+lilypad.bootloader.file=lilypad/LilyPadBOOT_168.hex
 lilypad.bootloader.unlock_bits=0x3F
 lilypad.bootloader.lock_bits=0x0F
 
@@ -347,15 +361,16 @@ lilypad.build.variant=standard
 
 pro5v328.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328
 
+pro5v328.upload.tool=avrdude
 pro5v328.upload.protocol=arduino
 pro5v328.upload.maximum_size=30720
 pro5v328.upload.speed=57600
 
+pro5v328.bootloader.tool=avrdude
 pro5v328.bootloader.low_fuses=0xFF
 pro5v328.bootloader.high_fuses=0xDA
 pro5v328.bootloader.extended_fuses=0x05
-pro5v328.bootloader.path=atmega
-pro5v328.bootloader.file=ATmegaBOOT_168_atmega328.hex
+pro5v328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
 pro5v328.bootloader.unlock_bits=0x3F
 pro5v328.bootloader.lock_bits=0x0F
 
@@ -368,15 +383,16 @@ pro5v328.build.variant=standard
 
 pro5v.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168
 
+pro5v.upload.tool=avrdude
 pro5v.upload.protocol=arduino
 pro5v.upload.maximum_size=14336
 pro5v.upload.speed=19200
 
+pro5v.bootloader.tool=avrdude
 pro5v.bootloader.low_fuses=0xff
 pro5v.bootloader.high_fuses=0xdd
 pro5v.bootloader.extended_fuses=0x00
-pro5v.bootloader.path=atmega
-pro5v.bootloader.file=ATmegaBOOT_168_diecimila.hex
+pro5v.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
 pro5v.bootloader.unlock_bits=0x3F
 pro5v.bootloader.lock_bits=0x0F
 
@@ -389,15 +405,16 @@ pro5v.build.variant=standard
 
 pro328.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
 
+pro328.upload.tool=avrdude
 pro328.upload.protocol=arduino
 pro328.upload.maximum_size=30720
 pro328.upload.speed=57600
 
+pro328.bootloader.tool=avrdude
 pro328.bootloader.low_fuses=0xFF
 pro328.bootloader.high_fuses=0xDA
 pro328.bootloader.extended_fuses=0x05
-pro328.bootloader.path=atmega
-pro328.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+pro328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
 pro328.bootloader.unlock_bits=0x3F
 pro328.bootloader.lock_bits=0x0F
 
@@ -410,15 +427,16 @@ pro328.build.variant=standard
 
 pro.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
 
+pro.upload.tool=avrdude
 pro.upload.protocol=arduino
 pro.upload.maximum_size=14336
 pro.upload.speed=19200
 
+pro.bootloader.tool=avrdude
 pro.bootloader.low_fuses=0xc6
 pro.bootloader.high_fuses=0xdd
 pro.bootloader.extended_fuses=0x00
-pro.bootloader.path=atmega
-pro.bootloader.file=ATmegaBOOT_168_pro_8MHz.hex
+pro.bootloader.file=atmega/ATmegaBOOT_168_pro_8MHz.hex
 pro.bootloader.unlock_bits=0x3F
 pro.bootloader.lock_bits=0x0F
 
@@ -431,15 +449,16 @@ pro.build.variant=standard
 
 atmega168.name=Arduino NG or older w/ ATmega168
 
+atmega168.upload.tool=avrdude
 atmega168.upload.protocol=arduino
 atmega168.upload.maximum_size=14336
 atmega168.upload.speed=19200
 
+atmega168.bootloader.tool=avrdude
 atmega168.bootloader.low_fuses=0xff
 atmega168.bootloader.high_fuses=0xdd
 atmega168.bootloader.extended_fuses=0x00
-atmega168.bootloader.path=atmega
-atmega168.bootloader.file=ATmegaBOOT_168_ng.hex
+atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
 atmega168.bootloader.unlock_bits=0x3F
 atmega168.bootloader.lock_bits=0x0F
 
@@ -452,14 +471,15 @@ atmega168.build.variant=standard
 
 atmega8.name=Arduino NG or older w/ ATmega8
 
+atmega8.upload.tool=avrdude
 atmega8.upload.protocol=arduino
 atmega8.upload.maximum_size=7168
 atmega8.upload.speed=19200
 
+atmega8.bootloader.tool=avrdude
 atmega8.bootloader.low_fuses=0xdf
 atmega8.bootloader.high_fuses=0xca
-atmega8.bootloader.path=atmega8
-atmega8.bootloader.file=ATmegaBOOT.hex
+atmega8.bootloader.file=atmega8/ATmegaBOOT.hex
 atmega8.bootloader.unlock_bits=0x3F
 atmega8.bootloader.lock_bits=0x0F