From 126ef66126c98cebf0bc6daad35a6d4fae36d583 Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <thibaut.viard@atmel.com>
Date: Wed, 30 Apr 2014 10:58:10 +0200
Subject: [PATCH]  fixing board definition for IDE

---
 boards.txt   | 51 ++++-----------------------------------------------
 platform.txt |  2 +-
 2 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/boards.txt b/boards.txt
index 5763de7b..54622cee 100644
--- a/boards.txt
+++ b/boards.txt
@@ -8,12 +8,12 @@ arduino_zero_dbg.upload.maximum_size=262144
 arduino_zero_dbg.upload.use_1200bps_touch=false
 arduino_zero_dbg.upload.wait_for_upload_port=false
 arduino_zero_dbg.upload.native_usb=false
-arduino_zero_dbg.build.mcu=cortex-m0p
+arduino_zero_dbg.build.mcu=cortex-m0plus
 arduino_zero_dbg.build.f_cpu=48000000L
 arduino_zero_dbg.build.usb_product="Arduino Zero"
 arduino_zero_dbg.build.board=SAM_ZERO
 arduino_zero_dbg.build.core=arduino
-arduino_zero_dbg.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
+arduino_zero_dbg.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
 arduino_zero_dbg.build.ldscript=linker_scripts/gcc/flash.ld
 arduino_zero_dbg.build.variant=arduino_zero
 arduino_zero_dbg.build.variant_system_lib=
@@ -29,57 +29,14 @@ arduino_zero.upload.maximum_size=262144
 arduino_zero.upload.use_1200bps_touch=false
 arduino_zero.upload.wait_for_upload_port=false
 arduino_zero.upload.native_usb=true
-arduino_zero.build.mcu=cortex-m0p
+arduino_zero.build.mcu=cortex-m0plus
 arduino_zero.build.f_cpu=48000000L
 arduino_zero.build.usb_product="Arduino Zero"
 arduino_zero.build.board=SAM_ZERO
 arduino_zero.build.core=arduino
-arduino_zero.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
+arduino_zero.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
 arduino_zero.build.ldscript=linker_scripts/gcc/flash.ld
 arduino_zero.build.variant=arduino_zero
 arduino_zero.build.variant_system_lib=
 arduino_zero.build.vid=0x2341
 arduino_zero.build.pid=0x004d
-
-arduino_zero_dbg.name=SAMS21-XPRO (Programming Port)
-arduino_zero_dbg.vid.0=0x03eb
-arduino_zero_dbg.pid.0=0x2111
-arduino_zero_dbg.upload.tool=bossac
-arduino_zero_dbg.upload.protocol=sam-ba
-arduino_zero_dbg.upload.maximum_size=262144
-arduino_zero_dbg.upload.use_1200bps_touch=false
-arduino_zero_dbg.upload.wait_for_upload_port=false
-arduino_zero_dbg.upload.native_usb=false
-arduino_zero_dbg.build.mcu=cortex-m0p
-arduino_zero_dbg.build.f_cpu=48000000L
-arduino_zero_dbg.build.usb_product="SAMD21-XPRO"
-arduino_zero_dbg.build.board=SAM_ZERO
-arduino_zero_dbg.build.core=arduino
-arduino_zero_dbg.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
-arduino_zero_dbg.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_zero_dbg.build.variant=samd21_xpro
-arduino_zero_dbg.build.variant_system_lib=
-arduino_zero_dbg.build.vid=0x03eb
-arduino_zero_dbg.build.pid=0x2111
-
-arduino_zero.name=SAMS21-XPRO (Native USB Port)
-arduino_zero.vid.0=0x2341
-arduino_zero.pid.0=0x004d
-arduino_zero.upload.tool=bossac
-arduino_zero.upload.protocol=sam-ba
-arduino_zero.upload.maximum_size=262144
-arduino_zero.upload.use_1200bps_touch=false
-arduino_zero.upload.wait_for_upload_port=false
-arduino_zero.upload.native_usb=true
-arduino_zero.build.mcu=cortex-m0p
-arduino_zero.build.f_cpu=48000000L
-arduino_zero.build.usb_product="SAMD21-XPRO"
-arduino_zero.build.board=SAM_ZERO
-arduino_zero.build.core=arduino
-arduino_zero.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
-arduino_zero.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_zero.build.variant=samd21_xpro
-arduino_zero.build.variant_system_lib=
-arduino_zero.build.vid=0x2341
-arduino_zero.build.pid=0x004d
-
diff --git a/platform.txt b/platform.txt
index a2bf0975..d5726fac 100644
--- a/platform.txt
+++ b/platform.txt
@@ -7,7 +7,7 @@
 name=Arduino ARM (32-bits) Boards
 version=1.5.6
 
-# SAM3 compile variables
+# SAMD compile variables
 # ----------------------
 
 compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
-- 
GitLab