From 1ac448a6b0bcea6c199998d3a35a89dafdab8cb6 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 16 Dec 2016 16:47:46 +0100
Subject: [PATCH 1/3] Update package_bundle with Arduino.org boards

---
 hardware/package_index_bundled.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index cd3ec6f44..ed9913446 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -19,8 +19,8 @@
           },
           "url": "http://downloads.arduino.cc/cores/avr-1.6.16.tar.bz2",
           "archiveFileName": "avr-1.6.16.tar.bz2",
-          "checksum": "SHA-256:c222efcabbdf6fa63ba3d64afb8d149f83fa73693c413aa05a2ccd9f986ed2fa",
-          "size": "4993959",
+          "checksum": "SHA-256:07b7a4b68c132e021d112c424cde1286a210dbf728884a214607cc8c4e602d6a",
+          "size": "5011038",
           "boards": [
             {"name": "Arduino Yún"},
             {"name": "Arduino/Genuino Uno"},
@@ -29,6 +29,7 @@
             {"name": "Arduino/Genuino Mega"},
             {"name": "Arduino MegaADK"},
             {"name": "Arduino Leonardo"},
+            {"name": "Arduino Leonardo Ethernet"},
             {"name": "Arduino/Genuino Micro"},
             {"name": "Arduino Esplora"},
             {"name": "Arduino Mini"},
@@ -42,7 +43,10 @@
             {"name": "Arduino Robot Control"},
             {"name": "Arduino Robot Motor"},
             {"name": "Arduino Gemma"},
-            {"name": "Adafruit Circuit Playground"}
+            {"name": "Adafruit Circuit Playground"},
+            {"name": "Arduino Yún Mini"},
+            {"name": "Arduino Industrial 101"},
+            {"name": "Linino One"}
           ],
           "toolsDependencies": [
             {
@@ -79,14 +83,14 @@
             },
             {
               "size": "711544",
-              "checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
+              "checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
               "host": "x86_64-linux-gnu",
               "archiveFileName": "avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2"
             },
             {
               "size": "701718",
-              "checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
+              "checksum": "SHA-256:8e2e4bc71d22e9d11ed143763b97f3aa2d164cdeee678a9deaf5b36e245b2d20",
               "host": "i686-linux-gnu",
               "archiveFileName": "avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2"

From 8ae25b90bbdcc805620bf9eadf51fd60985bef3b Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 16 Dec 2016 17:45:01 +0100
Subject: [PATCH 2/3] Fix Circuitplay core and tools reference

While not plainly wrong, since the board is not contained in a 3rd party package, use the "baseline" reference method
---
 hardware/arduino/avr/boards.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt
index 3a6d42746..484faeb6c 100644
--- a/hardware/arduino/avr/boards.txt
+++ b/hardware/arduino/avr/boards.txt
@@ -887,12 +887,12 @@ circuitplay32u4cat.bootloader.extended_fuses=0xcb
 circuitplay32u4cat.bootloader.file=caterina/Caterina-Circuitplay32u4.hex
 circuitplay32u4cat.bootloader.unlock_bits=0x3F
 circuitplay32u4cat.bootloader.lock_bits=0x2F
-circuitplay32u4cat.bootloader.tool=arduino:avrdude
+circuitplay32u4cat.bootloader.tool=avrdude
 circuitplay32u4cat.build.mcu=atmega32u4
 circuitplay32u4cat.build.f_cpu=8000000L
 circuitplay32u4cat.build.vid=0x239A
 circuitplay32u4cat.build.pid=0x8011
-circuitplay32u4cat.build.core=arduino:arduino
+circuitplay32u4cat.build.core=arduino
 circuitplay32u4cat.build.variant=circuitplay32u4
 circuitplay32u4cat.build.board=AVR_CIRCUITPLAY
 circuitplay32u4cat.build.usb_product="Circuit Playground"

From 6f2fd2f4c70a17bc8896cb712c3840f58fab9a6b Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 16 Dec 2016 18:10:06 +0100
Subject: [PATCH 3/3] Fix Circuitplay  tools reference (take 2)

---
 hardware/arduino/avr/boards.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt
index 484faeb6c..439f3b68f 100644
--- a/hardware/arduino/avr/boards.txt
+++ b/hardware/arduino/avr/boards.txt
@@ -904,7 +904,7 @@ circuitplay32u4cat.upload.speed=57600
 circuitplay32u4cat.upload.disable_flushing=true
 circuitplay32u4cat.upload.use_1200bps_touch=true
 circuitplay32u4cat.upload.wait_for_upload_port=true
-circuitplay32u4cat.upload.tool=arduino:avrdude
+circuitplay32u4cat.upload.tool=avrdude
 circuitplay32u4cat.vid.0=0x239A
 circuitplay32u4cat.pid.0=0x8011