Skip to content

Commit 196a29f

Browse files
authored
Merge pull request #232 from hathach/update-toolchain-cmsis
Update toolchain cmsis, fix build with tensorflow
2 parents fdddb19 + 53c92d4 commit 196a29f

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

boards.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ adafruit_metro_m4.build.vid=0x239A
448448
adafruit_metro_m4.build.pid=0x8020
449449
adafruit_metro_m4.bootloader.tool=openocd
450450
adafruit_metro_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
451-
adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
451+
adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
452452
adafruit_metro_m4.menu.cache.on=Enabled
453453
adafruit_metro_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
454454
adafruit_metro_m4.menu.cache.off=Disabled
@@ -514,7 +514,7 @@ adafruit_grandcentral_m4.build.vid=0x239A
514514
adafruit_grandcentral_m4.build.pid=0x8031
515515
adafruit_grandcentral_m4.bootloader.tool=openocd
516516
adafruit_grandcentral_m4.bootloader.file=grand_central_m4/bootloader-grandcentralM4-v2.0.0-adafruit.5.bin
517-
adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
517+
adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
518518
adafruit_grandcentral_m4.menu.cache.on=Enabled
519519
adafruit_grandcentral_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
520520
adafruit_grandcentral_m4.menu.cache.off=Disabled
@@ -577,7 +577,7 @@ adafruit_itsybitsy_m4.build.vid=0x239A
577577
adafruit_itsybitsy_m4.build.pid=0x802B
578578
adafruit_itsybitsy_m4.bootloader.tool=openocd
579579
adafruit_itsybitsy_m4.bootloader.file=itsybitsyM4/bootloader-itsybitsy_m4-v2.0.0-adafruit.5.bin
580-
adafruit_itsybitsy_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
580+
adafruit_itsybitsy_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
581581
adafruit_itsybitsy_m4.menu.cache.on=Enabled
582582
adafruit_itsybitsy_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
583583
adafruit_itsybitsy_m4.menu.cache.off=Disabled
@@ -640,7 +640,7 @@ adafruit_feather_m4.build.vid=0x239A
640640
adafruit_feather_m4.build.pid=0x8022
641641
adafruit_feather_m4.bootloader.tool=openocd
642642
adafruit_feather_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
643-
adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
643+
adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
644644
adafruit_feather_m4.menu.cache.on=Enabled
645645
adafruit_feather_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
646646
adafruit_feather_m4.menu.cache.off=Disabled
@@ -705,7 +705,7 @@ adafruit_trellis_m4.build.vid=0x239A
705705
adafruit_trellis_m4.build.pid=0x802F
706706
adafruit_trellis_m4.bootloader.tool=openocd
707707
adafruit_trellis_m4.bootloader.file=trellisM4/bootloader-trellis_m4-v2.0.0-adafruit.5.bin
708-
adafruit_trellis_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
708+
adafruit_trellis_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
709709
adafruit_trellis_m4.menu.cache.on=Enabled
710710
adafruit_trellis_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
711711
adafruit_trellis_m4.menu.cache.off=Disabled
@@ -768,7 +768,7 @@ adafruit_pyportal_m4.build.vid=0x239A
768768
adafruit_pyportal_m4.build.pid=0x8035
769769
adafruit_pyportal_m4.bootloader.tool=openocd
770770
adafruit_pyportal_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
771-
adafruit_pyportal_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
771+
adafruit_pyportal_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
772772
adafruit_pyportal_m4.menu.cache.on=Enabled
773773
adafruit_pyportal_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
774774
adafruit_pyportal_m4.menu.cache.off=Disabled
@@ -831,7 +831,7 @@ adafruit_pyportal_m4_titano.build.vid=0x239A
831831
adafruit_pyportal_m4_titano.build.pid=0x8035
832832
adafruit_pyportal_m4_titano.bootloader.tool=openocd
833833
adafruit_pyportal_m4_titano.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
834-
adafruit_pyportal_m4_titano.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
834+
adafruit_pyportal_m4_titano.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
835835
adafruit_pyportal_m4_titano.menu.cache.on=Enabled
836836
adafruit_pyportal_m4_titano.menu.cache.on.build.cache_flags=-DENABLE_CACHE
837837
adafruit_pyportal_m4_titano.menu.cache.off=Disabled
@@ -896,7 +896,7 @@ adafruit_pybadge_m4.build.vid=0x239A
896896
adafruit_pybadge_m4.build.pid=0x8033
897897
adafruit_pybadge_m4.bootloader.tool=openocd
898898
adafruit_pybadge_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
899-
adafruit_pybadge_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
899+
adafruit_pybadge_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
900900
adafruit_pybadge_m4.menu.cache.on=Enabled
901901
adafruit_pybadge_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
902902
adafruit_pybadge_m4.menu.cache.off=Disabled
@@ -960,7 +960,7 @@ adafruit_metro_m4_airliftlite.build.vid=0x239A
960960
adafruit_metro_m4_airliftlite.build.pid=0x8037
961961
adafruit_metro_m4_airliftlite.bootloader.tool=openocd
962962
adafruit_metro_m4_airliftlite.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
963-
adafruit_metro_m4_airliftlite.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
963+
adafruit_metro_m4_airliftlite.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
964964
adafruit_metro_m4_airliftlite.menu.cache.on=Enabled
965965
adafruit_metro_m4_airliftlite.menu.cache.on.build.cache_flags=-DENABLE_CACHE
966966
adafruit_metro_m4_airliftlite.menu.cache.off=Disabled
@@ -1025,7 +1025,7 @@ adafruit_pygamer_m4.build.vid=0x239A
10251025
adafruit_pygamer_m4.build.pid=0x803D
10261026
adafruit_pygamer_m4.bootloader.tool=openocd
10271027
adafruit_pygamer_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1028-
adafruit_pygamer_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1028+
adafruit_pygamer_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
10291029
adafruit_pygamer_m4.menu.cache.on=Enabled
10301030
adafruit_pygamer_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
10311031
adafruit_pygamer_m4.menu.cache.off=Disabled
@@ -1089,7 +1089,7 @@ adafruit_pygamer_advance_m4.build.vid=0x239A
10891089
adafruit_pygamer_advance_m4.build.pid=0x8041
10901090
adafruit_pygamer_advance_m4.bootloader.tool=openocd
10911091
adafruit_pygamer_advance_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1092-
adafruit_pygamer_advance_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1092+
adafruit_pygamer_advance_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
10931093
adafruit_pygamer_advance_m4.menu.cache.on=Enabled
10941094
adafruit_pygamer_advance_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
10951095
adafruit_pygamer_advance_m4.menu.cache.off=Disabled
@@ -1155,7 +1155,7 @@ adafruit_pybadge_airlift_m4.build.vid=0x239A
11551155
adafruit_pybadge_airlift_m4.build.pid=0x8043
11561156
adafruit_pybadge_airlift_m4.bootloader.tool=openocd
11571157
adafruit_pybadge_airlift_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1158-
adafruit_pybadge_airlift_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1158+
adafruit_pybadge_airlift_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
11591159
adafruit_pybadge_airlift_m4.menu.cache.on=Enabled
11601160
adafruit_pybadge_airlift_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
11611161
adafruit_pybadge_airlift_m4.menu.cache.off=Disabled
@@ -1221,7 +1221,7 @@ adafruit_monster_m4sk.build.vid=0x239A
12211221
adafruit_monster_m4sk.build.pid=0x8047
12221222
adafruit_monster_m4sk.bootloader.tool=openocd
12231223
adafruit_monster_m4sk.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1224-
adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1224+
adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
12251225
adafruit_monster_m4sk.menu.cache.on=Enabled
12261226
adafruit_monster_m4sk.menu.cache.on.build.cache_flags=-DENABLE_CACHE
12271227
adafruit_monster_m4sk.menu.cache.off=Disabled
@@ -1287,7 +1287,7 @@ adafruit_hallowing_m4.build.vid=0x239A
12871287
adafruit_hallowing_m4.build.pid=0x8049
12881288
adafruit_hallowing_m4.bootloader.tool=openocd
12891289
adafruit_hallowing_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1290-
adafruit_hallowing_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1290+
adafruit_hallowing_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
12911291
adafruit_hallowing_m4.menu.cache.on=Enabled
12921292
adafruit_hallowing_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
12931293
adafruit_hallowing_m4.menu.cache.off=Disabled

cores/arduino/WInterrupts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C" {
3131
#define FALLING 3
3232
#define RISING 4
3333

34-
#define DEFAULT 1
34+
//#define DEFAULT 1
3535
#define EXTERNAL 0
3636

3737
typedef void (*voidFuncPtr)(void);

platform.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
2121

2222
name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
23-
version=1.5.14
23+
version=1.6.0
2424

2525
# Compile variables
2626
# -----------------
@@ -31,7 +31,7 @@ compiler.warning_flags.default=
3131
compiler.warning_flags.more=-Wall -Wno-expansion-to-defined
3232
compiler.warning_flags.all=-Wall -Wextra -Wno-expansion-to-defined
3333

34-
compiler.path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
34+
compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
3535
compiler.c.cmd=arm-none-eabi-gcc
3636
compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD -D__SKETCH_NAME__="""{build.project_name}"""
3737
compiler.c.elf.cmd=arm-none-eabi-g++
@@ -70,8 +70,8 @@ compiler.S.extra_flags=
7070
compiler.ar.extra_flags=
7171
compiler.elf2hex.extra_flags=
7272

73-
compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.2.0.path}/CMSIS/Device/ATMEL/"
74-
compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
73+
compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Core/Include/" "-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/DSP/Include/" "-I{runtime.tools.CMSIS-Atmel-1.2.0.path}/CMSIS/Device/ATMEL/"
74+
compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
7575

7676
compiler.libraries.ldflags=
7777

0 commit comments

Comments
 (0)