From 5b3580fe36d893b18d22369390d60b2c9bffb10a Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <thibaut.viard@atmel.com>
Date: Thu, 29 Mar 2012 17:16:37 +0200
Subject: [PATCH] [sam] fixing boards definitions

---
 hardware/arduino/sam/boards.txt |  4 ++--
 hardware/google/sam/boards.txt  | 36 ++++++++++-----------------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/hardware/arduino/sam/boards.txt b/hardware/arduino/sam/boards.txt
index 1e3a5b985..231d86cc7 100644
--- a/hardware/arduino/sam/boards.txt
+++ b/hardware/arduino/sam/boards.txt
@@ -5,7 +5,7 @@ arduino_due_u.upload.tool=bossac
 arduino_due_u.upload.protocol=sam-ba
 arduino_due_u.upload.maximum_size=49152
 arduino_due_u.build.mcu=cortex-m3
-arduino_due_u.build.f_cpu=84000000L
+arduino_due_u.build.f_cpu=96000000L
 arduino_due_u.build.core=sam
 arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb 
 arduino_due_u.build.ldscript=linker_scripts/gcc/flash.ld
@@ -19,7 +19,7 @@ arduino_due_x.upload.tool=bossac
 arduino_due_x.upload.protocol=sam-ba
 arduino_due_x.upload.maximum_size=49152
 arduino_due_x.build.mcu=cortex-m3
-arduino_due_x.build.f_cpu=96000000L
+arduino_due_x.build.f_cpu=84000000L
 arduino_due_x.build.core=sam
 arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb 
 arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
diff --git a/hardware/google/sam/boards.txt b/hardware/google/sam/boards.txt
index 1e3a5b985..79530a14a 100644
--- a/hardware/google/sam/boards.txt
+++ b/hardware/google/sam/boards.txt
@@ -1,27 +1,13 @@
 ##############################################################
 
-arduino_due_u.name=Arduino DueU Dev. Ed.
-arduino_due_u.upload.tool=bossac
-arduino_due_u.upload.protocol=sam-ba
-arduino_due_u.upload.maximum_size=49152
-arduino_due_u.build.mcu=cortex-m3
-arduino_due_u.build.f_cpu=84000000L
-arduino_due_u.build.core=sam
-arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb 
-arduino_due_u.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_due_u.build.variant=arduino_due_u
-arduino_due_u.build.variant_system_lib=libsam_sam3u4e_gcc_rel.a
-
-##############################################################
-
-arduino_due_x.name=Arduino DueX Dev. Ed.
-arduino_due_x.upload.tool=bossac
-arduino_due_x.upload.protocol=sam-ba
-arduino_due_x.upload.maximum_size=49152
-arduino_due_x.build.mcu=cortex-m3
-arduino_due_x.build.f_cpu=96000000L
-arduino_due_x.build.core=sam
-arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb 
-arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_due_x.build.variant=arduino_due_x
-arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
+adk2.name=Google ADK2
+adk2.upload.tool=bossac
+adk2.upload.protocol=sam-ba
+adk2.upload.maximum_size=49152
+adk2.build.mcu=cortex-m3
+adk2.build.f_cpu=84000000L
+adk2.build.core=sam
+adk2.build.extra_flags=-D__SAM3X8E__ -mthumb 
+adk2.build.ldscript=linker_scripts/gcc/flash.ld
+adk2.build.variant=adk2
+adk2.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a