Skip to content

Commit 9125436

Browse files
ffissoreffissore
committed
Merge branch 'master' into boards-cputype
2 parents aa05b50 + 49ba327 commit 9125436

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+71
-3607
lines changed

‎build/shared/lib/keywords.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ shiftOut KEYWORD2 ShiftOut
163163
tone KEYWORD2 Tone
164164

165165
Serial KEYWORD3 Serial
166+
Serial1 KEYWORD3 Serial
166167
Serial2 KEYWORD3 Serial
167168
Serial3 KEYWORD3 Serial
168-
Serial4 KEYWORD3 Serial
169169
SerialUSB KEYWORD3 Serial
170170
begin KEYWORD2 Serial_Begin
171171
end KEYWORD2 Serial_End

‎hardware/arduino/sam/boards.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11

2-
arduino_due_x.name=Arduino Due Dev. Ed.
3-
arduino_due_x.upload.tool=bossac
4-
arduino_due_x.upload.protocol=sam-ba
5-
arduino_due_x.upload.maximum_size=524288
6-
arduino_due_x.upload.use_1200bps_touch=true
7-
arduino_due_x.upload.wait_for_upload_port=true
8-
arduino_due_x.upload.native_usb=true
9-
arduino_due_x.build.mcu=cortex-m3
10-
arduino_due_x.build.f_cpu=84000000L
11-
arduino_due_x.build.core=arduino
12-
arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb -DUSB_PID={build.pid} -DUSB_VID={build.vid} -DUSBCON
13-
arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
14-
arduino_due_x.build.variant=arduino_due_x
15-
arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
16-
arduino_due_x.build.vid=0x2341
17-
arduino_due_x.build.pid=0x003e
18-
19-
arduino_due_x_dbg.name=Arduino Due Dev. Ed. (Debug port)
2+
arduino_due_x_dbg.name=Arduino Due Dev. Ed. (Programming port)
203
arduino_due_x_dbg.upload.tool=bossac
214
arduino_due_x_dbg.upload.protocol=sam-ba
225
arduino_due_x_dbg.upload.maximum_size=524288
@@ -33,3 +16,20 @@ arduino_due_x_dbg.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
3316
arduino_due_x_dbg.build.vid=0x2341
3417
arduino_due_x_dbg.build.pid=0x003e
3518

19+
arduino_due_x.name=Arduino Due Dev. Ed. (Native port)
20+
arduino_due_x.upload.tool=bossac
21+
arduino_due_x.upload.protocol=sam-ba
22+
arduino_due_x.upload.maximum_size=524288
23+
arduino_due_x.upload.use_1200bps_touch=true
24+
arduino_due_x.upload.wait_for_upload_port=true
25+
arduino_due_x.upload.native_usb=true
26+
arduino_due_x.build.mcu=cortex-m3
27+
arduino_due_x.build.f_cpu=84000000L
28+
arduino_due_x.build.core=arduino
29+
arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb -DUSB_PID={build.pid} -DUSB_VID={build.vid} -DUSBCON
30+
arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
31+
arduino_due_x.build.variant=arduino_due_x
32+
arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
33+
arduino_due_x.build.vid=0x2341
34+
arduino_due_x.build.pid=0x003e
35+

‎hardware/arduino/sam/variants/adk2/build_gcc/Makefile

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎hardware/arduino/sam/variants/adk2/build_gcc/debug.mk

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎hardware/arduino/sam/variants/adk2/build_gcc/gcc.mk

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎hardware/arduino/sam/variants/adk2/build_gcc/libvariant_adk2.mk

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)