diff --git a/hardware/arduino/sam/boards.txt b/hardware/arduino/sam/boards.txt index 137e92b3d..ad1abfe22 100644 --- a/hardware/arduino/sam/boards.txt +++ b/hardware/arduino/sam/boards.txt @@ -6,7 +6,7 @@ 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=96000000L -arduino_due_u.build.core=sam +arduino_due_u.build.core=arduino arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb -DUSB_PID={build.pid} -DUSB_VID={build.vid} -DUSBCON arduino_due_u.build.ldscript=linker_scripts/gcc/flash.ld arduino_due_u.build.variant=arduino_due_u @@ -22,7 +22,7 @@ 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=84000000L -arduino_due_x.build.core=sam +arduino_due_x.build.core=arduino arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb -DUSB_PID={build.pid} -DUSB_VID={build.vid} -DUSBCON arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld arduino_due_x.build.variant=arduino_due_x diff --git a/hardware/arduino/sam/cores/sam/Arduino.h b/hardware/arduino/sam/cores/arduino/Arduino.h similarity index 100% rename from hardware/arduino/sam/cores/sam/Arduino.h rename to hardware/arduino/sam/cores/arduino/Arduino.h diff --git a/hardware/arduino/sam/cores/sam/HOWTO - compiling a project.txt b/hardware/arduino/sam/cores/arduino/HOWTO - compiling a project.txt similarity index 51% rename from hardware/arduino/sam/cores/sam/HOWTO - compiling a project.txt rename to hardware/arduino/sam/cores/arduino/HOWTO - compiling a project.txt index 2f60ef42b..66587e107 100644 --- a/hardware/arduino/sam/cores/sam/HOWTO - compiling a project.txt +++ b/hardware/arduino/sam/cores/arduino/HOWTO - compiling a project.txt @@ -13,19 +13,19 @@ run the command: 'cs-make' This will compile the libsam library and deliver to main Arduino folder the files: -hardware/sam/cores/sam/libsam_sam3s4c_gcc_dbg.a -hardware/sam/cores/sam/libsam_sam3s4c_gcc_dbg.a.txt (result of nm) +hardware/sam/cores/arduino/libsam_sam3s4c_gcc_dbg.a +hardware/sam/cores/arduino/libsam_sam3s4c_gcc_dbg.a.txt (result of nm) 3- Compile libarduino (Arduino API) -Go to hardware/sam/cores/sam/build_gcc +Go to hardware/sam/cores/arduino/build_gcc run the command: 'cs-make' This will compile the libarduino library and deliver to main Arduino folder the files: -hardware/sam/cores/sam/libarduino_sam3s_ek_gcc_dbg.a -hardware/sam/cores/sam/libarduino_sam3s_ek_gcc_dbg.a.txt (result of nm) +hardware/sam/cores/arduino/libarduino_sam3s_ek_gcc_dbg.a +hardware/sam/cores/arduino/libarduino_sam3s_ek_gcc_dbg.a.txt (result of nm) 4- Compile libvariant (variant specific library, use Arduino API and libsam) @@ -35,21 +35,21 @@ run the command: 'cs-make' This will compile the libvariant library and deliver to main Arduino folder the files: -hardware/sam/cores/sam/libvariant_sam3s_ek_gcc_dbg.a -hardware/sam/cores/sam/libvariant_sam3s_ek_gcc_dbg.a.txt (result of nm) +hardware/sam/cores/arduino/libvariant_sam3s_ek_gcc_dbg.a +hardware/sam/cores/arduino/libvariant_sam3s_ek_gcc_dbg.a.txt (result of nm) 5- Compile test application -Go to hardware/sam/cores/sam/validation/build_gcc +Go to hardware/sam/cores/arduino/validation/build_gcc run the command: 'cs-make' This will compile the test application and deliver the binary into: -hardware/sam/cores/sam/validation/debug_sam3s_ek/test_gcc_dbg.elf -hardware/sam/cores/sam/validation/debug_sam3s_ek/test_gcc_dbg.bin -hardware/sam/cores/sam/validation/debug_sam3s_ek/test_gcc_dbg.map (mapping matching linker script) -hardware/sam/cores/sam/validation/debug_sam3s_ek/test_gcc_dbg.elf.txt (result of nm) +hardware/sam/cores/arduino/validation/debug_sam3s_ek/test_gcc_dbg.elf +hardware/sam/cores/arduino/validation/debug_sam3s_ek/test_gcc_dbg.bin +hardware/sam/cores/arduino/validation/debug_sam3s_ek/test_gcc_dbg.map (mapping matching linker script) +hardware/sam/cores/arduino/validation/debug_sam3s_ek/test_gcc_dbg.elf.txt (result of nm) diff --git a/hardware/arduino/sam/cores/sam/HardwareSerial.h b/hardware/arduino/sam/cores/arduino/HardwareSerial.h similarity index 100% rename from hardware/arduino/sam/cores/sam/HardwareSerial.h rename to hardware/arduino/sam/cores/arduino/HardwareSerial.h diff --git a/hardware/arduino/sam/cores/sam/Print.cpp b/hardware/arduino/sam/cores/arduino/Print.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/Print.cpp rename to hardware/arduino/sam/cores/arduino/Print.cpp diff --git a/hardware/arduino/sam/cores/sam/Print.h b/hardware/arduino/sam/cores/arduino/Print.h similarity index 100% rename from hardware/arduino/sam/cores/sam/Print.h rename to hardware/arduino/sam/cores/arduino/Print.h diff --git a/hardware/arduino/sam/cores/sam/Printable.h b/hardware/arduino/sam/cores/arduino/Printable.h similarity index 100% rename from hardware/arduino/sam/cores/sam/Printable.h rename to hardware/arduino/sam/cores/arduino/Printable.h diff --git a/hardware/arduino/sam/cores/sam/RingBuffer.cpp b/hardware/arduino/sam/cores/arduino/RingBuffer.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/RingBuffer.cpp rename to hardware/arduino/sam/cores/arduino/RingBuffer.cpp diff --git a/hardware/arduino/sam/cores/sam/RingBuffer.h b/hardware/arduino/sam/cores/arduino/RingBuffer.h similarity index 100% rename from hardware/arduino/sam/cores/sam/RingBuffer.h rename to hardware/arduino/sam/cores/arduino/RingBuffer.h diff --git a/hardware/arduino/sam/cores/sam/Stream.h b/hardware/arduino/sam/cores/arduino/Stream.h similarity index 100% rename from hardware/arduino/sam/cores/sam/Stream.h rename to hardware/arduino/sam/cores/arduino/Stream.h diff --git a/hardware/arduino/sam/cores/sam/Tone.cpp.disabled b/hardware/arduino/sam/cores/arduino/Tone.cpp.disabled similarity index 100% rename from hardware/arduino/sam/cores/sam/Tone.cpp.disabled rename to hardware/arduino/sam/cores/arduino/Tone.cpp.disabled diff --git a/hardware/arduino/sam/cores/sam/Tone.h b/hardware/arduino/sam/cores/arduino/Tone.h similarity index 100% rename from hardware/arduino/sam/cores/sam/Tone.h rename to hardware/arduino/sam/cores/arduino/Tone.h diff --git a/hardware/arduino/sam/cores/sam/UARTClass.cpp b/hardware/arduino/sam/cores/arduino/UARTClass.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/UARTClass.cpp rename to hardware/arduino/sam/cores/arduino/UARTClass.cpp diff --git a/hardware/arduino/sam/cores/sam/UARTClass.h b/hardware/arduino/sam/cores/arduino/UARTClass.h similarity index 100% rename from hardware/arduino/sam/cores/sam/UARTClass.h rename to hardware/arduino/sam/cores/arduino/UARTClass.h diff --git a/hardware/arduino/sam/cores/sam/USARTClass.cpp b/hardware/arduino/sam/cores/arduino/USARTClass.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/USARTClass.cpp rename to hardware/arduino/sam/cores/arduino/USARTClass.cpp diff --git a/hardware/arduino/sam/cores/sam/USARTClass.h b/hardware/arduino/sam/cores/arduino/USARTClass.h similarity index 100% rename from hardware/arduino/sam/cores/sam/USARTClass.h rename to hardware/arduino/sam/cores/arduino/USARTClass.h diff --git a/hardware/arduino/sam/cores/sam/USB/CDC.cpp b/hardware/arduino/sam/cores/arduino/USB/CDC.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/CDC.cpp rename to hardware/arduino/sam/cores/arduino/USB/CDC.cpp diff --git a/hardware/arduino/sam/cores/sam/USB/HID.cpp b/hardware/arduino/sam/cores/arduino/USB/HID.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/HID.cpp rename to hardware/arduino/sam/cores/arduino/USB/HID.cpp diff --git a/hardware/arduino/sam/cores/sam/USB/USBAPI.h b/hardware/arduino/sam/cores/arduino/USB/USBAPI.h similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/USBAPI.h rename to hardware/arduino/sam/cores/arduino/USB/USBAPI.h diff --git a/hardware/arduino/sam/cores/sam/USB/USBCore.cpp b/hardware/arduino/sam/cores/arduino/USB/USBCore.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/USBCore.cpp rename to hardware/arduino/sam/cores/arduino/USB/USBCore.cpp diff --git a/hardware/arduino/sam/cores/sam/USB/USBCore.cpp.old b/hardware/arduino/sam/cores/arduino/USB/USBCore.cpp.old similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/USBCore.cpp.old rename to hardware/arduino/sam/cores/arduino/USB/USBCore.cpp.old diff --git a/hardware/arduino/sam/cores/sam/USB/USBCore.h b/hardware/arduino/sam/cores/arduino/USB/USBCore.h similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/USBCore.h rename to hardware/arduino/sam/cores/arduino/USB/USBCore.h diff --git a/hardware/arduino/sam/cores/sam/USB/USBDesc.h b/hardware/arduino/sam/cores/arduino/USB/USBDesc.h similarity index 100% rename from hardware/arduino/sam/cores/sam/USB/USBDesc.h rename to hardware/arduino/sam/cores/arduino/USB/USBDesc.h diff --git a/hardware/arduino/sam/cores/sam/WCharacter.h b/hardware/arduino/sam/cores/arduino/WCharacter.h similarity index 100% rename from hardware/arduino/sam/cores/sam/WCharacter.h rename to hardware/arduino/sam/cores/arduino/WCharacter.h diff --git a/hardware/arduino/sam/cores/sam/WInterrupts.c b/hardware/arduino/sam/cores/arduino/WInterrupts.c similarity index 100% rename from hardware/arduino/sam/cores/sam/WInterrupts.c rename to hardware/arduino/sam/cores/arduino/WInterrupts.c diff --git a/hardware/arduino/sam/cores/sam/WInterrupts.h b/hardware/arduino/sam/cores/arduino/WInterrupts.h similarity index 100% rename from hardware/arduino/sam/cores/sam/WInterrupts.h rename to hardware/arduino/sam/cores/arduino/WInterrupts.h diff --git a/hardware/arduino/sam/cores/sam/WMath.cpp b/hardware/arduino/sam/cores/arduino/WMath.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/WMath.cpp rename to hardware/arduino/sam/cores/arduino/WMath.cpp diff --git a/hardware/arduino/sam/cores/sam/WMath.h b/hardware/arduino/sam/cores/arduino/WMath.h similarity index 100% rename from hardware/arduino/sam/cores/sam/WMath.h rename to hardware/arduino/sam/cores/arduino/WMath.h diff --git a/hardware/arduino/sam/cores/sam/WString.cpp b/hardware/arduino/sam/cores/arduino/WString.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/WString.cpp rename to hardware/arduino/sam/cores/arduino/WString.cpp diff --git a/hardware/arduino/sam/cores/sam/WString.h b/hardware/arduino/sam/cores/arduino/WString.h similarity index 100% rename from hardware/arduino/sam/cores/sam/WString.h rename to hardware/arduino/sam/cores/arduino/WString.h diff --git a/hardware/arduino/sam/cores/sam/binary.h b/hardware/arduino/sam/cores/arduino/binary.h similarity index 100% rename from hardware/arduino/sam/cores/sam/binary.h rename to hardware/arduino/sam/cores/arduino/binary.h diff --git a/hardware/arduino/sam/cores/sam/build_gcc/Makefile b/hardware/arduino/sam/cores/arduino/build_gcc/Makefile similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/Makefile rename to hardware/arduino/sam/cores/arduino/build_gcc/Makefile diff --git a/hardware/arduino/sam/cores/sam/build_gcc/debug.mk b/hardware/arduino/sam/cores/arduino/build_gcc/debug.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/debug.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/debug.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/gcc.mk b/hardware/arduino/sam/cores/arduino/build_gcc/gcc.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/gcc.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/gcc.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk b/hardware/arduino/sam/cores/arduino/build_gcc/libarduino_adk2.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/libarduino_adk2.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk b/hardware/arduino/sam/cores/arduino/build_gcc/libarduino_arduino_due_u.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/libarduino_arduino_due_u.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk b/hardware/arduino/sam/cores/arduino/build_gcc/libarduino_arduino_due_x.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/libarduino_arduino_due_x.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk b/hardware/arduino/sam/cores/arduino/build_gcc/libarduino_sam3s_ek.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/libarduino_sam3s_ek.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk b/hardware/arduino/sam/cores/arduino/build_gcc/libarduino_sam3u_ek.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/libarduino_sam3u_ek.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk b/hardware/arduino/sam/cores/arduino/build_gcc/libarduino_sam3x_ek.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/libarduino_sam3x_ek.mk diff --git a/hardware/arduino/sam/cores/sam/build_gcc/release.mk b/hardware/arduino/sam/cores/arduino/build_gcc/release.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/build_gcc/release.mk rename to hardware/arduino/sam/cores/arduino/build_gcc/release.mk diff --git a/hardware/arduino/sam/cores/sam/build_iar/libarduino.ewd b/hardware/arduino/sam/cores/arduino/build_iar/libarduino.ewd similarity index 100% rename from hardware/arduino/sam/cores/sam/build_iar/libarduino.ewd rename to hardware/arduino/sam/cores/arduino/build_iar/libarduino.ewd diff --git a/hardware/arduino/sam/cores/sam/build_iar/libarduino.ewp b/hardware/arduino/sam/cores/arduino/build_iar/libarduino.ewp similarity index 100% rename from hardware/arduino/sam/cores/sam/build_iar/libarduino.ewp rename to hardware/arduino/sam/cores/arduino/build_iar/libarduino.ewp diff --git a/hardware/arduino/sam/cores/sam/cortex_handlers.c b/hardware/arduino/sam/cores/arduino/cortex_handlers.c similarity index 100% rename from hardware/arduino/sam/cores/sam/cortex_handlers.c rename to hardware/arduino/sam/cores/arduino/cortex_handlers.c diff --git a/hardware/arduino/sam/cores/sam/cxxabi-compat.cpp b/hardware/arduino/sam/cores/arduino/cxxabi-compat.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/cxxabi-compat.cpp rename to hardware/arduino/sam/cores/arduino/cxxabi-compat.cpp diff --git a/hardware/arduino/sam/cores/sam/iar_calls_sam3.c b/hardware/arduino/sam/cores/arduino/iar_calls_sam3.c similarity index 100% rename from hardware/arduino/sam/cores/sam/iar_calls_sam3.c rename to hardware/arduino/sam/cores/arduino/iar_calls_sam3.c diff --git a/hardware/arduino/sam/cores/sam/itoa.c b/hardware/arduino/sam/cores/arduino/itoa.c similarity index 100% rename from hardware/arduino/sam/cores/sam/itoa.c rename to hardware/arduino/sam/cores/arduino/itoa.c diff --git a/hardware/arduino/sam/cores/sam/itoa.h b/hardware/arduino/sam/cores/arduino/itoa.h similarity index 100% rename from hardware/arduino/sam/cores/sam/itoa.h rename to hardware/arduino/sam/cores/arduino/itoa.h diff --git a/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a b/hardware/arduino/sam/cores/arduino/libsam_sam3x8e_gcc_dbg.a similarity index 100% rename from hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a rename to hardware/arduino/sam/cores/arduino/libsam_sam3x8e_gcc_dbg.a diff --git a/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a.txt b/hardware/arduino/sam/cores/arduino/libsam_sam3x8e_gcc_dbg.a.txt similarity index 100% rename from hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a.txt rename to hardware/arduino/sam/cores/arduino/libsam_sam3x8e_gcc_dbg.a.txt diff --git a/hardware/arduino/sam/cores/sam/main.cpp b/hardware/arduino/sam/cores/arduino/main.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/main.cpp rename to hardware/arduino/sam/cores/arduino/main.cpp diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/Makefile b/hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/Makefile similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/Makefile rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/Makefile diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/debug.mk b/hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/debug.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/debug.mk rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/debug.mk diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/gcc.mk b/hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/gcc.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/gcc.mk rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/gcc.mk diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/prod_test_due.mk b/hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/prod_test_due.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/prod_test_due.mk rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/prod_test_due.mk diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/release.mk b/hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/release.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_gcc/release.mk rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_gcc/release.mk diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_iar/prod_test_due.ewd b/hardware/arduino/sam/cores/arduino/prod_test_due/build_iar/prod_test_due.ewd similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_iar/prod_test_due.ewd rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_iar/prod_test_due.ewd diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/build_iar/prod_test_due.ewp b/hardware/arduino/sam/cores/arduino/prod_test_due/build_iar/prod_test_due.ewp similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/build_iar/prod_test_due.ewp rename to hardware/arduino/sam/cores/arduino/prod_test_due/build_iar/prod_test_due.ewp diff --git a/hardware/arduino/sam/cores/sam/prod_test_due/main.cpp.disabled b/hardware/arduino/sam/cores/arduino/prod_test_due/main.cpp.disabled similarity index 100% rename from hardware/arduino/sam/cores/sam/prod_test_due/main.cpp.disabled rename to hardware/arduino/sam/cores/arduino/prod_test_due/main.cpp.disabled diff --git a/hardware/arduino/sam/cores/sam/syscalls.h b/hardware/arduino/sam/cores/arduino/syscalls.h similarity index 100% rename from hardware/arduino/sam/cores/sam/syscalls.h rename to hardware/arduino/sam/cores/arduino/syscalls.h diff --git a/hardware/arduino/sam/cores/sam/syscalls_sam3.c b/hardware/arduino/sam/cores/arduino/syscalls_sam3.c similarity index 100% rename from hardware/arduino/sam/cores/sam/syscalls_sam3.c rename to hardware/arduino/sam/cores/arduino/syscalls_sam3.c diff --git a/hardware/arduino/sam/cores/sam/validation/build_gcc/Makefile b/hardware/arduino/sam/cores/arduino/validation/build_gcc/Makefile similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/build_gcc/Makefile rename to hardware/arduino/sam/cores/arduino/validation/build_gcc/Makefile diff --git a/hardware/arduino/sam/cores/sam/validation/build_gcc/debug.mk b/hardware/arduino/sam/cores/arduino/validation/build_gcc/debug.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/build_gcc/debug.mk rename to hardware/arduino/sam/cores/arduino/validation/build_gcc/debug.mk diff --git a/hardware/arduino/sam/cores/sam/validation/build_gcc/gcc.mk b/hardware/arduino/sam/cores/arduino/validation/build_gcc/gcc.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/build_gcc/gcc.mk rename to hardware/arduino/sam/cores/arduino/validation/build_gcc/gcc.mk diff --git a/hardware/arduino/sam/cores/sam/validation/build_gcc/release.mk b/hardware/arduino/sam/cores/arduino/validation/build_gcc/release.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/build_gcc/release.mk rename to hardware/arduino/sam/cores/arduino/validation/build_gcc/release.mk diff --git a/hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk b/hardware/arduino/sam/cores/arduino/validation/build_gcc/test.mk similarity index 99% rename from hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk rename to hardware/arduino/sam/cores/arduino/validation/build_gcc/test.mk index 8f2d89f63..d24b9872e 100644 --- a/hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk +++ b/hardware/arduino/sam/cores/arduino/validation/build_gcc/test.mk @@ -81,7 +81,7 @@ CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) -ARDUINO_CORE_PATH=../../../../cores/sam +ARDUINO_CORE_PATH=../../../../cores/arduino ARDUINO_USB_PATH=$(ARDUINO_CORE_PATH)/USB # Output directories diff --git a/hardware/arduino/sam/cores/sam/validation/build_iar/test.ewd b/hardware/arduino/sam/cores/arduino/validation/build_iar/test.ewd similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/build_iar/test.ewd rename to hardware/arduino/sam/cores/arduino/validation/build_iar/test.ewd diff --git a/hardware/arduino/sam/cores/sam/validation/build_iar/test.ewp b/hardware/arduino/sam/cores/arduino/validation/build_iar/test.ewp similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/build_iar/test.ewp rename to hardware/arduino/sam/cores/arduino/validation/build_iar/test.ewp diff --git a/hardware/arduino/sam/cores/sam/validation/test.cpp b/hardware/arduino/sam/cores/arduino/validation/test.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/validation/test.cpp rename to hardware/arduino/sam/cores/arduino/validation/test.cpp diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/Makefile b/hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/Makefile similarity index 100% rename from hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/Makefile rename to hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/Makefile diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/debug.mk b/hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/debug.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/debug.mk rename to hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/debug.mk diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/gcc.mk b/hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/gcc.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/gcc.mk rename to hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/gcc.mk diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/release.mk b/hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/release.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/release.mk rename to hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/release.mk diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/test_usb_device.mk b/hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/test_usb_device.mk similarity index 100% rename from hardware/arduino/sam/cores/sam/validation_usb_device/build_gcc/test_usb_device.mk rename to hardware/arduino/sam/cores/arduino/validation_usb_device/build_gcc/test_usb_device.mk diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp b/hardware/arduino/sam/cores/arduino/validation_usb_device/test_usb_device.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp rename to hardware/arduino/sam/cores/arduino/validation_usb_device/test_usb_device.cpp diff --git a/hardware/arduino/sam/cores/sam/wiring.c b/hardware/arduino/sam/cores/arduino/wiring.c similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring.c rename to hardware/arduino/sam/cores/arduino/wiring.c diff --git a/hardware/arduino/sam/cores/sam/wiring.h b/hardware/arduino/sam/cores/arduino/wiring.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring.h rename to hardware/arduino/sam/cores/arduino/wiring.h diff --git a/hardware/arduino/sam/cores/sam/wiring_analog.c b/hardware/arduino/sam/cores/arduino/wiring_analog.c similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_analog.c rename to hardware/arduino/sam/cores/arduino/wiring_analog.c diff --git a/hardware/arduino/sam/cores/sam/wiring_analog.h b/hardware/arduino/sam/cores/arduino/wiring_analog.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_analog.h rename to hardware/arduino/sam/cores/arduino/wiring_analog.h diff --git a/hardware/arduino/sam/cores/sam/wiring_constants.h b/hardware/arduino/sam/cores/arduino/wiring_constants.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_constants.h rename to hardware/arduino/sam/cores/arduino/wiring_constants.h diff --git a/hardware/arduino/sam/cores/sam/wiring_digital.c b/hardware/arduino/sam/cores/arduino/wiring_digital.c similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_digital.c rename to hardware/arduino/sam/cores/arduino/wiring_digital.c diff --git a/hardware/arduino/sam/cores/sam/wiring_digital.h b/hardware/arduino/sam/cores/arduino/wiring_digital.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_digital.h rename to hardware/arduino/sam/cores/arduino/wiring_digital.h diff --git a/hardware/arduino/sam/cores/sam/wiring_private.h b/hardware/arduino/sam/cores/arduino/wiring_private.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_private.h rename to hardware/arduino/sam/cores/arduino/wiring_private.h diff --git a/hardware/arduino/sam/cores/sam/wiring_pulse.cpp b/hardware/arduino/sam/cores/arduino/wiring_pulse.cpp similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_pulse.cpp rename to hardware/arduino/sam/cores/arduino/wiring_pulse.cpp diff --git a/hardware/arduino/sam/cores/sam/wiring_pulse.h b/hardware/arduino/sam/cores/arduino/wiring_pulse.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_pulse.h rename to hardware/arduino/sam/cores/arduino/wiring_pulse.h diff --git a/hardware/arduino/sam/cores/sam/wiring_shift.c b/hardware/arduino/sam/cores/arduino/wiring_shift.c similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_shift.c rename to hardware/arduino/sam/cores/arduino/wiring_shift.c diff --git a/hardware/arduino/sam/cores/sam/wiring_shift.h b/hardware/arduino/sam/cores/arduino/wiring_shift.h similarity index 100% rename from hardware/arduino/sam/cores/sam/wiring_shift.h rename to hardware/arduino/sam/cores/arduino/wiring_shift.h diff --git a/hardware/arduino/sam/system/libsam/build_gcc/sam3.mk b/hardware/arduino/sam/system/libsam/build_gcc/sam3.mk index aec6b70df..17d95ea08 100644 --- a/hardware/arduino/sam/system/libsam/build_gcc/sam3.mk +++ b/hardware/arduino/sam/system/libsam/build_gcc/sam3.mk @@ -41,7 +41,7 @@ endif #------------------------------------------------------------------------------- # Output directories -OUTPUT_BIN = ../../../cores/sam +OUTPUT_BIN = ../../../cores/arduino # Libraries PROJECT_BASE_PATH = .. diff --git a/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk b/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk index cca1e1c02..5eafdd107 100644 --- a/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk +++ b/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk @@ -29,7 +29,7 @@ TOOLCHAIN=gcc #------------------------------------------------------------------------------- # Output directories -OUTPUT_BIN = ../../../cores/sam +OUTPUT_BIN = ../../../cores/arduino # Libraries PROJECT_BASE_PATH = .. @@ -39,7 +39,7 @@ CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL #CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) -ARDUINO_PATH = ../../../cores/sam +ARDUINO_PATH = ../../../cores/arduino VARIANT_BASE_PATH = ../../../variants VARIANT_PATH = ../../../variants/$(VARIANT) diff --git a/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk b/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk index df93700f4..cd836513e 100644 --- a/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk +++ b/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk @@ -29,7 +29,7 @@ TOOLCHAIN=gcc #------------------------------------------------------------------------------- # Output directories -OUTPUT_BIN = ../../../cores/sam +OUTPUT_BIN = ../../../cores/arduino # Libraries PROJECT_BASE_PATH = .. @@ -39,7 +39,7 @@ CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL #CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) -ARDUINO_PATH = ../../../cores/sam +ARDUINO_PATH = ../../../cores/arduino VARIANT_BASE_PATH = ../../../variants VARIANT_PATH = ../../../variants/$(VARIANT)