Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Conflicts:
	build/macosx/dist/tools-universal.zip
	build/windows/avr_tools.zip
	hardware/arduino/cores/arduino/HardwareSerial.cpp

1 files changed, 40 insertions, 19 deletions

diff --git a/boards.txt b/boards.txt
index f6bd36e..57fe222 100644
--- a/boards.txt
+++ b/boards.txt
@@ -19,7 +19,7 @@ leonardo.build.variant=leonardo
 ##############################################################
 
 uno.name=Arduino Uno
-uno.upload.protocol=stk500
+uno.upload.protocol=arduino
 uno.upload.maximum_size=32256
 uno.upload.speed=115200
 uno.bootloader.low_fuses=0xff
@@ -38,7 +38,7 @@ uno.build.variant=standard
 
 atmega328.name=Arduino Duemilanove w/ ATmega328
 
-atmega328.upload.protocol=stk500
+atmega328.upload.protocol=arduino
 atmega328.upload.maximum_size=30720
 atmega328.upload.speed=57600
 
@@ -59,7 +59,7 @@ atmega328.build.variant=standard
 
 diecimila.name=Arduino Diecimila or Duemilanove w/ ATmega168
 
-diecimila.upload.protocol=stk500
+diecimila.upload.protocol=arduino
 diecimila.upload.maximum_size=14336
 diecimila.upload.speed=19200
 
@@ -80,7 +80,7 @@ diecimila.build.variant=standard
 
 nano328.name=Arduino Nano w/ ATmega328
 
-nano328.upload.protocol=stk500
+nano328.upload.protocol=arduino
 nano328.upload.maximum_size=30720
 nano328.upload.speed=57600
 
@@ -101,7 +101,7 @@ nano328.build.variant=eightanaloginputs
 
 nano.name=Arduino Nano w/ ATmega168
 
-nano.upload.protocol=stk500
+nano.upload.protocol=arduino
 nano.upload.maximum_size=14336
 nano.upload.speed=19200
 
@@ -120,7 +120,7 @@ nano.build.variant=eightanaloginputs
 
 ##############################################################
 
-mega2560.name=Arduino Mega 2560
+mega2560.name=Arduino Mega 2560 or Mega ADK
 
 mega2560.upload.protocol=stk500v2
 mega2560.upload.maximum_size=258048
@@ -143,7 +143,7 @@ mega2560.build.variant=mega
 
 mega.name=Arduino Mega (ATmega1280)
 
-mega.upload.protocol=stk500
+mega.upload.protocol=arduino
 mega.upload.maximum_size=126976
 mega.upload.speed=57600
 
@@ -164,7 +164,7 @@ mega.build.variant=mega
 
 mini.name=Arduino Mini
 
-mini.upload.protocol=stk500
+mini.upload.protocol=arduino
 mini.upload.maximum_size=14336
 mini.upload.speed=19200
 
@@ -183,9 +183,30 @@ mini.build.variant=eightanaloginputs
 
 ##############################################################
 
+ethernet.name=Arduino Ethernet
+
+ethernet.upload.protocol=stk500
+ethernet.upload.maximum_size=32256
+ethernet.upload.speed=115200
+
+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.unlock_bits=0x3F
+ethernet.bootloader.lock_bits=0x0F
+
+ethernet.build.variant=standard
+ethernet.build.mcu=atmega328p
+ethernet.build.f_cpu=16000000L
+ethernet.build.core=arduino
+
+##############################################################
+
 fio.name=Arduino Fio
 
-fio.upload.protocol=stk500
+fio.upload.protocol=arduino
 fio.upload.maximum_size=30720
 fio.upload.speed=57600
 
@@ -206,7 +227,7 @@ fio.build.variant=eightanaloginputs
 
 bt328.name=Arduino BT w/ ATmega328
 
-bt328.upload.protocol=stk500
+bt328.upload.protocol=arduino
 bt328.upload.maximum_size=28672
 bt328.upload.speed=19200
 bt328.upload.disable_flushing=true
@@ -228,7 +249,7 @@ bt328.build.variant=eightanaloginputs
 
 bt.name=Arduino BT w/ ATmega168
 
-bt.upload.protocol=stk500
+bt.upload.protocol=arduino
 bt.upload.maximum_size=14336
 bt.upload.speed=19200
 bt.upload.disable_flushing=true
@@ -250,7 +271,7 @@ bt.build.variant=eightanaloginputs
 
 lilypad328.name=LilyPad Arduino w/ ATmega328
 
-lilypad328.upload.protocol=stk500
+lilypad328.upload.protocol=arduino
 lilypad328.upload.maximum_size=30720
 lilypad328.upload.speed=57600
 
@@ -271,7 +292,7 @@ lilypad328.build.variant=standard
 
 lilypad.name=LilyPad Arduino w/ ATmega168
 
-lilypad.upload.protocol=stk500
+lilypad.upload.protocol=arduino
 lilypad.upload.maximum_size=14336
 lilypad.upload.speed=19200
 
@@ -292,7 +313,7 @@ lilypad.build.variant=standard
 
 pro5v328.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328
 
-pro5v328.upload.protocol=stk500
+pro5v328.upload.protocol=arduino
 pro5v328.upload.maximum_size=30720
 pro5v328.upload.speed=57600
 
@@ -313,7 +334,7 @@ pro5v328.build.variant=standard
 
 pro5v.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168
 
-pro5v.upload.protocol=stk500
+pro5v.upload.protocol=arduino
 pro5v.upload.maximum_size=14336
 pro5v.upload.speed=19200
 
@@ -334,7 +355,7 @@ pro5v.build.variant=standard
 
 pro328.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
 
-pro328.upload.protocol=stk500
+pro328.upload.protocol=arduino
 pro328.upload.maximum_size=30720
 pro328.upload.speed=57600
 
@@ -355,7 +376,7 @@ pro328.build.variant=standard
 
 pro.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
 
-pro.upload.protocol=stk500
+pro.upload.protocol=arduino
 pro.upload.maximum_size=14336
 pro.upload.speed=19200
 
@@ -376,7 +397,7 @@ pro.build.variant=standard
 
 atmega168.name=Arduino NG or older w/ ATmega168
 
-atmega168.upload.protocol=stk500
+atmega168.upload.protocol=arduino
 atmega168.upload.maximum_size=14336
 atmega168.upload.speed=19200
 
@@ -397,7 +418,7 @@ atmega168.build.variant=standard
 
 atmega8.name=Arduino NG or older w/ ATmega8
 
-atmega8.upload.protocol=stk500
+atmega8.upload.protocol=arduino
 atmega8.upload.maximum_size=7168
 atmega8.upload.speed=19200