aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2018-07-31 10:58:57 -0400
committerKevin O'Connor <kevin@koconnor.net>2018-08-06 23:36:05 -0400
commite1146c04fd4b8d3f1de0c4fe202513c843868acb (patch)
treee14bebc620dd7f558629f78497d9b0d82b05ae74 /src
parent8572cae9a0fea745477b9464115c472651d64eb6 (diff)
downloadkutter-e1146c04fd4b8d3f1de0c4fe202513c843868acb.tar.gz
kutter-e1146c04fd4b8d3f1de0c4fe202513c843868acb.tar.xz
kutter-e1146c04fd4b8d3f1de0c4fe202513c843868acb.zip
sam3x8e: Use SAM3X CMSIS files instead of arduino CMSIS files
Update the sam3x8e port use the most recent SAM3X CMSIS files from Atmel. The Atmel files appear to have a more consistent license and it is unclear if there were Arduino specific changes in the CMSIS files obtained from the Arduino repo. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src')
-rw-r--r--src/sam3x8e/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sam3x8e/Makefile b/src/sam3x8e/Makefile
index 289ffb2e..b7e26fcc 100644
--- a/src/sam3x8e/Makefile
+++ b/src/sam3x8e/Makefile
@@ -4,22 +4,22 @@
CROSS_PREFIX=arm-none-eabi-
dirs-y += src/sam3x8e src/generic
-dirs-y += lib/cmsis-sam3x8e/source lib/cmsis-sam3x8e/source/gcc
+dirs-y += lib/sam3x/gcc/gcc
CFLAGS += -mthumb -mcpu=cortex-m3
-CFLAGS += -Ilib/cmsis-sam3x8e/include -Ilib/cmsis-sam3x8e/cmsis-include
+CFLAGS += -Ilib/sam3x/include -Ilib/cmsis-core
CFLAGS += -D__SAM3X8E__
-CFLAGS_klipper.elf += -Llib/cmsis-sam3x8e/source/gcc
-CFLAGS_klipper.elf += -T lib/cmsis-sam3x8e/source/gcc/sam3x8e_flash.ld
+CFLAGS_klipper.elf += -Llib/sam3x/gcc/gcc
+CFLAGS_klipper.elf += -T lib/sam3x/gcc/gcc/sam3x8e_flash.ld
CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
# Add source files
src-y += sam3x8e/main.c sam3x8e/timer.c sam3x8e/gpio.c sam3x8e/spi.c
src-y += generic/crc16_ccitt.c generic/alloc.c
src-y += generic/armcm_irq.c generic/timer_irq.c
-src-y += ../lib/cmsis-sam3x8e/source/system_sam3xa.c
-src-y += ../lib/cmsis-sam3x8e/source/gcc/startup_sam3xa.c
+src-y += ../lib/sam3x/gcc/system_sam3xa.c
+src-y += ../lib/sam3x/gcc/gcc/startup_sam3xa.c
src-$(CONFIG_SERIAL) += sam3x8e/serial.c generic/serial_irq.c
# Build the additional hex output file