Skip to content

Commit d7617ab

Browse files
author
Brian Baltz
committed
ATLEDGE-364 Rename EDU to Arduino 101
Signed-off-by: Brian Baltz <brian.a.baltz@intel.com>
1 parent 7436867 commit d7617ab

24 files changed

+75
-79
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# corelibs-atlasedge
1+
# corelibs-arduino101

boards.txt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22

33
##############################################################
44

5-
intel_edu_x.name=Intel® EDU
6-
7-
intel_edu_x.vid.0=0x8087
8-
intel_edu_x.pid.0=0x0AB6
9-
intel_edu_x.vid.0x2A03.warning=Uncertified
10-
11-
intel_edu_x.upload.tool=eduload
12-
intel_edu_x.upload.protocol=script
13-
intel_edu_x.upload.maximum_size=196608
14-
intel_edu_x.upload.use_1200bps_touch=true
15-
intel_edu_x.upload.wait_for_upload_port=false
16-
intel_edu_x.upload.native_usb=false
17-
intel_edu_x.upload.params.quiet=-q
18-
intel_edu_x.upload.params.verbose=-q
19-
20-
intel_edu_x.build.usb_product="Intel EDU"
21-
intel_edu_x.build.mcu=ARCv2EM
22-
intel_edu_x.build.f_cpu=32000000L
23-
intel_edu_x.build.board=ARC32_TOOLS
24-
intel_edu_x.build.core=arduino
25-
intel_edu_x.build.ldscript=linker_scripts/flash.ld
26-
intel_edu_x.build.variant=intel_edu_x
27-
intel_edu_x.build.variant_system_lib=arc32drv_edu
28-
intel_edu_x.build.vid=0x8087
29-
intel_edu_x.build.pid=0x0AB6
5+
arduino_101_x.name=Arduino 101
6+
7+
arduino_101_x.vid.0=0x8087
8+
arduino_101_x.pid.0=0x0AB6
9+
arduino_101_x.vid.0x2A03.warning=Uncertified
10+
11+
arduino_101_x.upload.tool=arduino101load
12+
arduino_101_x.upload.protocol=script
13+
arduino_101_x.upload.maximum_size=196608
14+
arduino_101_x.upload.use_1200bps_touch=true
15+
arduino_101_x.upload.wait_for_upload_port=false
16+
arduino_101_x.upload.native_usb=false
17+
arduino_101_x.upload.params.quiet=-q
18+
arduino_101_x.upload.params.verbose=-q
19+
20+
arduino_101_x.build.usb_product="Arduino 101"
21+
arduino_101_x.build.mcu=ARCv2EM
22+
arduino_101_x.build.f_cpu=32000000L
23+
arduino_101_x.build.board=ARC32_TOOLS
24+
arduino_101_x.build.core=arduino
25+
arduino_101_x.build.ldscript=linker_scripts/flash.ld
26+
arduino_101_x.build.variant=arduino_101_x
27+
arduino_101_x.build.variant_system_lib=arc32drv_arduino101
28+
arduino_101_x.build.vid=0x8087
29+
arduino_101_x.build.pid=0x0AB6
3030

3131
##############################################################
3232

cores/arduino/CDCSerialClass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
License along with this library; if not, write to the Free Software
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818
19-
CDC-ACM class for Intel EDU - Aug 2015 <dave.hunt@emutex.com>
19+
CDC-ACM class for Arduino 101 - Aug 2015 <dave.hunt@emutex.com>
2020
2121
*/
2222

cores/arduino/CDCSerialClass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
License along with this library; if not, write to the Free Software
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818
19-
CDC-ACM class for Intel EDU - Aug 2015 <dave.hunt@emutex.com>
19+
CDC-ACM class for Arduino 101 - Aug 2015 <dave.hunt@emutex.com>
2020
2121
*/
2222

cores/arduino/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
main.cpp userspace main loop for Intel EDU family boards
2+
main.cpp userspace main loop for Arduino 101 family boards
33
Copyright (C) 2014 Intel Corporation
44
55
This library is free software; you can redistribute it and/or

cores/arduino/wiring.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern void initVariant( void ) ;
3636
extern void init( void ) ;
3737

3838
/**
39-
* \brief Returns the number of milliseconds since the Intel EDU board began
39+
* \brief Returns the number of milliseconds since the Arduino 101 board began
4040
* running the current program.
4141
*
4242
* This number will practically never overflow (go back to zero).
@@ -46,7 +46,7 @@ extern void init( void ) ;
4646
extern uint64_t millis( void ) ;
4747

4848
/**
49-
* \brief Returns the number of microseconds since the Intel EDU board began
49+
* \brief Returns the number of microseconds since the Arduino 101 board began
5050
* running the current program.
5151
*
5252
* This number will practically never overflow (go back to zero).

cores/arduino/wiring_analog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
extern "C" {
2424
#endif
2525

26-
/* TODO - update analogReference and other ADC-related functions for Intel EDU */
26+
/* TODO - update analogReference and other ADC-related functions for Arduino 101 */
2727

2828
/*
2929
* \brief SAM3 products have only one reference for ADC

cores/arduino/wiring_digital.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extern void pinMode( uint8_t pin, uint8_t mode ) ;
3737
* If the pin has been configured as an OUTPUT with pinMode(), its voltage will be set to the
3838
* corresponding value: 3.3V for HIGH, 0V (ground) for LOW.
3939
*
40-
* TODO - update the text below for Intel EDU
40+
* TODO - update the text below for Arduino 101
4141
*
4242
* If the pin is configured as an INPUT, writing a HIGH value with digitalWrite() will enable an internal
4343
* 20K pullup resistor (see the tutorial on digital pins). Writing LOW will disable the pullup. The pullup

cores/arduino/wiring_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
$Id: wiring.h 239 2007-01-12 17:58:39Z mellis $
2323
24-
Modified to allow compiling for Intel EDU - September 2015 <dino.tinitigan@intel.com>
24+
Modified to allow compiling for Arduino 101 - September 2015 <dino.tinitigan@intel.com>
2525
*/
2626

2727
#ifndef WiringPrivate_h

libraries/SPI/SPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2014 by Paul Stoffregen <paul@pjrc.com> (Transaction API)
44
* Copyright (c) 2014 by Matthijs Kooijman <matthijs@stdin.nl> (SPISettings AVR)
55
* Copyright (c) 2014 by Andrew J. Kroll <xxxajk@gmail.com> (atomicity fixes)
6-
* Copyright (c) 2015 by Intel Corporation <dan@emutex.com> (Intel EDU support)
6+
* Copyright (c) 2015 by Intel Corporation <dan@emutex.com> (Arduino 101 support)
77
* SPI Master library for arduino.
88
*
99
* This file is free software; you can redistribute it and/or modify

libraries/SPI/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name=SPI
22
version=1.0
33
author=Intel/Emutex
44
maintainer=Intel/Emutex <dan@emutex.com>
5-
sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. For all Intel EDU boards.
5+
sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. For all Arduino 101 boards.
66
paragraph=
77
url=http://www.arduino.cc/en/Reference/SPI
88
architectures=arc32

libraries/Servo/README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Servo Library for Arduino =
22

3-
This library allows an Intel EDU board to control RC (hobby) servo motors.
3+
This library allows an Arduino 101 board to control RC (hobby) servo motors.
44

55
For more information about this library please visit us at
66
http://www.arduino.cc/en/Reference/Servo

libraries/Servo/Servo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Servo.cpp - Interrupt driven Servo library for Arduino using ARC Timer 1 on Intel EDU boards
2+
Servo.cpp - Interrupt driven Servo library for Arduino using ARC Timer 1 on Arduino 101 boards
33
Copyright (c) 2009 Michael Margolis. All right reserved.
44
55
This library is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
1616
License along with this library; if not, write to the Free Software
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818
19-
Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Intel EDU
19+
Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Arduino 101
2020
*/
2121

2222
#include "interrupt.h"

libraries/Servo/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name=Servo
22
version=1.0
33
author=Intel/Emutex
44
maintainer=Intel/Emutex <kevin@emutex.com>
5-
sentence=Intel EDU Servo Library
5+
sentence=Arduino 101 Servo Library
66
paragraph=This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos using only 1 timer.
77
category=Device Control
88
url=http://www.arduino.cc/en/Reference/Servo

libraries/Wire/libraries.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version=1.0
33
author=Intel
44
maintainer=Intel
55
email=dave@emutex.com
6-
sentence=Intel EDU Wire library
7-
paragraph=Supports Intel EDU Arduino Breakout board
6+
sentence=Arduino 101 Wire library
7+
paragraph=Supports Arduino 101 Arduino Breakout board
88
url=http://makers.intel.com
99
architectures=arc32
1010
core-dependencies=arduino (>=1.6.3)

platform.txt

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

2-
# Intel EDU Core and platform.
2+
# Arduino 101 Core and platform.
33
#
44
# For more info:
55
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
@@ -35,9 +35,9 @@ compiler.strip.cmd={compiler.prefix}-strip
3535
build.extra_flags=
3636

3737
# These can be overridden in platform.local.txt
38-
compiler.c.extra_flags=-D__CPU_ARC__ -DCLOCK_SPEED=32 -DCONFIG_SOC_GPIO_32 -DCONFIG_SOC_GPIO_AON -DINFRA_MULTI_CPU_SUPPORT -DCFW_MULTI_CPU_SUPPORT -DHAS_SHARED_MEM "-I{build.system.path}/libarc32_edu/common" "-I{build.system.path}/libarc32_edu/drivers" "-I{build.system.path}/libarc32_edu/bootcode" "-I{build.system.path}/libarc32_edu/framework/include"
38+
compiler.c.extra_flags=-D__CPU_ARC__ -DCLOCK_SPEED=32 -DCONFIG_SOC_GPIO_32 -DCONFIG_SOC_GPIO_AON -DINFRA_MULTI_CPU_SUPPORT -DCFW_MULTI_CPU_SUPPORT -DHAS_SHARED_MEM "-I{build.system.path}/libarc32_arduino101/common" "-I{build.system.path}/libarc32_arduino101/drivers" "-I{build.system.path}/libarc32_arduino101/bootcode" "-I{build.system.path}/libarc32_arduino101/framework/include"
3939
compiler.c.elf.extra_flags=
40-
compiler.cpp.extra_flags=-D__CPU_ARC__ -DCLOCK_SPEED=32 -DCONFIG_SOC_GPIO_32 -DCONFIG_SOC_GPIO_AON -DINFRA_MULTI_CPU_SUPPORT -DCFW_MULTI_CPU_SUPPORT -DHAS_SHARED_MEM "-I{build.system.path}/libarc32_edu/common" "-I{build.system.path}/libarc32_edu/drivers" "-I{build.system.path}/libarc32_edu/bootcode" "-I{build.system.path}/libarc32_edu/framework/include"
40+
compiler.cpp.extra_flags=-D__CPU_ARC__ -DCLOCK_SPEED=32 -DCONFIG_SOC_GPIO_32 -DCONFIG_SOC_GPIO_AON -DINFRA_MULTI_CPU_SUPPORT -DCFW_MULTI_CPU_SUPPORT -DHAS_SHARED_MEM "-I{build.system.path}/libarc32_arduino101/common" "-I{build.system.path}/libarc32_arduino101/drivers" "-I{build.system.path}/libarc32_arduino101/bootcode" "-I{build.system.path}/libarc32_arduino101/framework/include"
4141
compiler.ar.extra_flags=
4242
compiler.elf2hex.extra_flags=
4343

@@ -53,7 +53,7 @@ build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON '-DUSB_MANU
5353
build.usb_manufacturer="Unknown"
5454

5555

56-
# Intel EDU compile patterns
56+
# Arduino 101 compile patterns
5757
# ---------------------
5858

5959
## Compile c files
@@ -80,16 +80,16 @@ recipe.size.regex=Total\s+([0-9]+).*
8080

8181
# Arc Uploader/Programmers tools
8282
# -------------------
83-
tools.eduload.cmd.path={runtime.tools.sketchUploader.path}/clupload/cluploadEDU_osx.sh
84-
tools.eduload.cmd.path.linux="{runtime.tools.sketchUploader.path}/clupload/cluploadEDU_linux.sh"
85-
tools.eduload.cmd.path.windows={runtime.tools.sketchUploader.path}/x86/bin/bash.exe
86-
tools.eduload.cmd.script.windows={runtime.tools.sketchUploader.path}/clupload/cluploadEDU_win.sh
87-
tools.eduload.cmd.bin.windows={runtime.tools.sketchUploader.path}/x86/bin
88-
89-
tools.eduload.upload.params.verbose=-vvvvvv
90-
tools.eduload.upload.params.quiet=-q
91-
92-
tools.eduload.upload.pattern=/bin/bash --verbose --noprofile "{cmd.path}" "{runtime.tools.sketchUploader.path}/x86/bin" {build.path}/{build.project_name}.elf {serial.port}
93-
tools.eduload.upload.pattern.linux=/bin/bash --verbose --noprofile {cmd.path} "{runtime.tools.sketchUploader.path}/x86/bin" {build.path}/{build.project_name}.elf {serial.port}
94-
tools.eduload.upload.elf.windows={build.path}/{build.project_name}.elf
95-
tools.eduload.upload.pattern.windows="{cmd.path}" "--verbose" "--noprofile" "{cmd.script}" "{cmd.bin}" "{upload.elf}" "{serial.port}"
83+
tools.arduino101load.cmd.path={runtime.tools.sketchUploader.path}/clupload/cluploadArduino101_osx.sh
84+
tools.arduino101load.cmd.path.linux="{runtime.tools.sketchUploader.path}/clupload/cluploadArduino101_linux.sh"
85+
tools.arduino101load.cmd.path.windows={runtime.tools.sketchUploader.path}/x86/bin/bash.exe
86+
tools.arduino101load.cmd.script.windows={runtime.tools.sketchUploader.path}/clupload/cluploadArduino101_win.sh
87+
tools.arduino101load.cmd.bin.windows={runtime.tools.sketchUploader.path}/x86/bin
88+
89+
tools.arduino101load.upload.params.verbose=-vvvvvv
90+
tools.arduino101load.upload.params.quiet=-q
91+
92+
tools.arduino101load.upload.pattern=/bin/bash --verbose --noprofile "{cmd.path}" "{runtime.tools.sketchUploader.path}/x86/bin" {build.path}/{build.project_name}.elf {serial.port}
93+
tools.arduino101load.upload.pattern.linux=/bin/bash --verbose --noprofile {cmd.path} "{runtime.tools.sketchUploader.path}/x86/bin" {build.path}/{build.project_name}.elf {serial.port}
94+
tools.arduino101load.upload.elf.windows={build.path}/{build.project_name}.elf
95+
tools.arduino101load.upload.pattern.windows="{cmd.path}" "--verbose" "--noprofile" "{cmd.script}" "{cmd.bin}" "{upload.elf}" "{serial.port}"

system/libarc32_edu/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ AS=arc-elf32-as
1818
RM=rm -f
1919
INSTALL=install
2020

21-
TARGET=arc32drv_edu
21+
TARGET=arc32drv_arduino101
2222
TARGET_LIB=lib$(TARGET).a
2323

2424
HWFLAGS=-mARCv2EM -mav2em -mlittle-endian

system/libarc32_edu/common/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* board.h - board configuration macros for the atlas_peak-arc BSP */
1+
/* board.h - board configuration macros for the Arduino 101-arc BSP */
22

33
/*
44
* Copyright (c) 2014-2015 Wind River Systems, Inc.
@@ -33,7 +33,7 @@
3333
/*
3434
DESCRIPTION
3535
This header file is used to specify and describe board-level aspects for the
36-
'atlas_peak-arc' BSP.
36+
'Arduino 101-arc' BSP.
3737
*/
3838

3939
#ifndef _BOARD__H_

system/libarc32_edu/drivers/ns16550.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ int uart_break_check(int which /* UART to check */
541541
*
542542
* The delay implementation must be working in panic context where IRQs
543543
* or other features are disabled, so a basic for loop is used.
544-
* A value of (1<<12) is more or less 1 ms on AtlasPeak 1/Lakemont (32 MHz).
544+
* A value of (1<<12) is more or less 1 ms on Arduino 101/Lakemont (32 MHz).
545545
*
546546
* RETURNS: N/A
547547
*/

system/libarc32_edu/framework/include/platform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct platform_shared_block_ {
111111
struct cdc_acm_shared_data * cdc_acm_buffers;
112112
};
113113

114-
#ifdef CONFIG_BOARD_ATLASPEAK_EMU
114+
#ifdef CONFIG_BOARD_ARDUINO101_EMU
115115
#define RAM_START 0xffb00000
116116
#else
117117
#define RAM_START 0xA8000000

system/libarc32_edu/framework/src/os/os.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,12 @@ void * cfw_alloc(int size, OS_ERR_TYPE * err) {
4141
void * ptr;
4242
unsigned int flags = interrupt_lock();
4343
ptr = malloc(size+sizeof(void*));
44-
if (ptr != NULL) {
45-
(*(int*) ptr) = size;
44+
(*(int*) ptr) = size;
4645
#ifdef TRACK_ALLOCS
47-
alloc_count++;
46+
alloc_count++;
4847
#endif
49-
interrupt_unlock(flags);
50-
return ptr;
51-
} else {
52-
interrupt_unlock(flags);
53-
return 0;
54-
}
48+
interrupt_unlock(flags);
49+
return ptr;
5550
}
5651

5752
void cfw_free(void * ptr, OS_ERR_TYPE * err) {

variants/intel_edu_x/linker_scripts/flash.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
/*
3434
DESCRIPTION
35-
Linker script for the Atlas Peak ARC BSPs.
35+
Linker script for the Arduino 101 ARC BSPs.
3636
*/
3737

3838
OUTPUT_FORMAT("elf32-littlearc", "elf32-bigarc", "elf32-littlearc")

variants/intel_edu_x/variant.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525

2626
/*
27-
* EDU Board pin | GPIO | Label
27+
* Arduino 101
28+
* Board pin | GPIO | Label
2829
* ----------------+--------------+-------
2930
* 0 | GPIO_SS[9] | "RX0"
3031
* 1 | GPIO_SS[8] | "TX0"

variants/intel_edu_x/variant.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#ifndef _VARIANT_INTEL_EDU_X_
20-
#define _VARIANT_INTEL_EDU_X_
19+
#ifndef _VARIANT_ARDUINO_101_X_
20+
#define _VARIANT_ARDUINO_101_X_
2121

2222
#include "gpio.h"
2323
#include "ss_gpio_iface.h"
@@ -49,7 +49,7 @@ extern "C"{
4949
* Platform Identifiers
5050
*----------------------------------------------------------------------------*/
5151
#define PLATFORM_ID 0xAE
52-
#define PLATFORM_NAME "AtlasEdge"
52+
#define PLATFORM_NAME "Arduino101"
5353

5454
/*----------------------------------------------------------------------------
5555
* Pins
@@ -204,5 +204,5 @@ void CDCSerial_bytes_sent(uint32_t num);
204204

205205
extern uint32_t sizeof_g_APinDescription;
206206

207-
#endif /* _VARIANT_INTEL_EDU_X_ */
207+
#endif /* _VARIANT_ARDUINO_101_X_ */
208208

0 commit comments

Comments
 (0)