Merge pull request #232 from hathach/update-toolchain-cmsis

Update toolchain cmsis, fix build with tensorflow
adafruit · Jul 7, 2020 · 196a29f · 196a29f
2 parents fdddb19 + 53c92d4
commit 196a29f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/boards.txt b/boards.txt
@@ -448,7 +448,7 @@ adafruit_metro_m4.build.vid=0x239A
 adafruit_metro_m4.build.pid=0x8020
 adafruit_metro_m4.bootloader.tool=openocd
 adafruit_metro_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_metro_m4.menu.cache.on=Enabled
 adafruit_metro_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_metro_m4.menu.cache.off=Disabled
@@ -514,7 +514,7 @@ adafruit_grandcentral_m4.build.vid=0x239A
 adafruit_grandcentral_m4.build.pid=0x8031
 adafruit_grandcentral_m4.bootloader.tool=openocd
 adafruit_grandcentral_m4.bootloader.file=grand_central_m4/bootloader-grandcentralM4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_grandcentral_m4.menu.cache.on=Enabled
 adafruit_grandcentral_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_grandcentral_m4.menu.cache.off=Disabled
@@ -577,7 +577,7 @@ adafruit_itsybitsy_m4.build.vid=0x239A
 adafruit_itsybitsy_m4.build.pid=0x802B
 adafruit_itsybitsy_m4.bootloader.tool=openocd
 adafruit_itsybitsy_m4.bootloader.file=itsybitsyM4/bootloader-itsybitsy_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_itsybitsy_m4.menu.cache.on=Enabled
 adafruit_itsybitsy_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_itsybitsy_m4.menu.cache.off=Disabled
@@ -640,7 +640,7 @@ adafruit_feather_m4.build.vid=0x239A
 adafruit_feather_m4.build.pid=0x8022
 adafruit_feather_m4.bootloader.tool=openocd
 adafruit_feather_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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 
+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 
 adafruit_feather_m4.menu.cache.on=Enabled
 adafruit_feather_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_feather_m4.menu.cache.off=Disabled
@@ -705,7 +705,7 @@ adafruit_trellis_m4.build.vid=0x239A
 adafruit_trellis_m4.build.pid=0x802F
 adafruit_trellis_m4.bootloader.tool=openocd
 adafruit_trellis_m4.bootloader.file=trellisM4/bootloader-trellis_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_trellis_m4.menu.cache.on=Enabled
 adafruit_trellis_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_trellis_m4.menu.cache.off=Disabled
@@ -768,7 +768,7 @@ adafruit_pyportal_m4.build.vid=0x239A
 adafruit_pyportal_m4.build.pid=0x8035
 adafruit_pyportal_m4.bootloader.tool=openocd
 adafruit_pyportal_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_pyportal_m4.menu.cache.on=Enabled
 adafruit_pyportal_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_pyportal_m4.menu.cache.off=Disabled
@@ -831,7 +831,7 @@ adafruit_pyportal_m4_titano.build.vid=0x239A
 adafruit_pyportal_m4_titano.build.pid=0x8035
 adafruit_pyportal_m4_titano.bootloader.tool=openocd
 adafruit_pyportal_m4_titano.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_pyportal_m4_titano.menu.cache.on=Enabled
 adafruit_pyportal_m4_titano.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_pyportal_m4_titano.menu.cache.off=Disabled
@@ -896,7 +896,7 @@ adafruit_pybadge_m4.build.vid=0x239A
 adafruit_pybadge_m4.build.pid=0x8033
 adafruit_pybadge_m4.bootloader.tool=openocd
 adafruit_pybadge_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_pybadge_m4.menu.cache.on=Enabled
 adafruit_pybadge_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_pybadge_m4.menu.cache.off=Disabled
@@ -960,7 +960,7 @@ adafruit_metro_m4_airliftlite.build.vid=0x239A
 adafruit_metro_m4_airliftlite.build.pid=0x8037
 adafruit_metro_m4_airliftlite.bootloader.tool=openocd
 adafruit_metro_m4_airliftlite.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_metro_m4_airliftlite.menu.cache.on=Enabled
 adafruit_metro_m4_airliftlite.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_metro_m4_airliftlite.menu.cache.off=Disabled
@@ -1025,7 +1025,7 @@ adafruit_pygamer_m4.build.vid=0x239A
 adafruit_pygamer_m4.build.pid=0x803D
 adafruit_pygamer_m4.bootloader.tool=openocd
 adafruit_pygamer_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_pygamer_m4.menu.cache.on=Enabled
 adafruit_pygamer_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_pygamer_m4.menu.cache.off=Disabled
@@ -1089,7 +1089,7 @@ adafruit_pygamer_advance_m4.build.vid=0x239A
 adafruit_pygamer_advance_m4.build.pid=0x8041
 adafruit_pygamer_advance_m4.bootloader.tool=openocd
 adafruit_pygamer_advance_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_pygamer_advance_m4.menu.cache.on=Enabled
 adafruit_pygamer_advance_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_pygamer_advance_m4.menu.cache.off=Disabled
@@ -1155,7 +1155,7 @@ adafruit_pybadge_airlift_m4.build.vid=0x239A
 adafruit_pybadge_airlift_m4.build.pid=0x8043
 adafruit_pybadge_airlift_m4.bootloader.tool=openocd
 adafruit_pybadge_airlift_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_pybadge_airlift_m4.menu.cache.on=Enabled
 adafruit_pybadge_airlift_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_pybadge_airlift_m4.menu.cache.off=Disabled
@@ -1221,7 +1221,7 @@ adafruit_monster_m4sk.build.vid=0x239A
 adafruit_monster_m4sk.build.pid=0x8047
 adafruit_monster_m4sk.bootloader.tool=openocd
 adafruit_monster_m4sk.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_monster_m4sk.menu.cache.on=Enabled
 adafruit_monster_m4sk.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_monster_m4sk.menu.cache.off=Disabled
@@ -1287,7 +1287,7 @@ adafruit_hallowing_m4.build.vid=0x239A
 adafruit_hallowing_m4.build.pid=0x8049
 adafruit_hallowing_m4.bootloader.tool=openocd
 adafruit_hallowing_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
-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
+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
 adafruit_hallowing_m4.menu.cache.on=Enabled
 adafruit_hallowing_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
 adafruit_hallowing_m4.menu.cache.off=Disabled

diff --git a/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore b/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore
diff --git a/cores/arduino/WInterrupts.h b/cores/arduino/WInterrupts.h
@@ -31,7 +31,7 @@ extern "C" {
 #define FALLING 3
 #define RISING 4
 
-#define DEFAULT 1
+//#define DEFAULT 1
 #define EXTERNAL 0
 
 typedef void (*voidFuncPtr)(void);

diff --git a/platform.txt b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
-version=1.5.14
+version=1.6.0
 
 # Compile variables
 # -----------------
@@ -31,7 +31,7 @@ compiler.warning_flags.default=
 compiler.warning_flags.more=-Wall -Wno-expansion-to-defined
 compiler.warning_flags.all=-Wall -Wextra -Wno-expansion-to-defined
 
-compiler.path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
+compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 compiler.c.cmd=arm-none-eabi-gcc
 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}"""
 compiler.c.elf.cmd=arm-none-eabi-g++
@@ -70,8 +70,8 @@ compiler.S.extra_flags=
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
-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/"
-compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
+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/"
+compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 compiler.libraries.ldflags=
+2 −0		Adafruit_USBD_CDC.h
+129 −48		Adafruit_USBD_Device.cpp
+3 −2		Adafruit_USBD_Device.h
+17 −12		tinyusb/README.md
+73 −33		tinyusb/src/class/cdc/cdc_device.c
+38 −8		tinyusb/src/class/cdc/cdc_device.h
+2 −2		tinyusb/src/class/hid/hid.h
+23 −6		tinyusb/src/class/hid/hid_device.c
+4 −4		tinyusb/src/class/hid/hid_device.h
+131 −74		tinyusb/src/class/midi/midi_device.c
+15 −0		tinyusb/src/class/midi/midi_device.h
+7 −4		tinyusb/src/class/msc/msc_device.c
+6 −4		tinyusb/src/class/usbtmc/usbtmc_device.c
+1 −1		tinyusb/src/class/usbtmc/usbtmc_device.h
+11 −3		tinyusb/src/class/vendor/vendor_device.c
+7 −3		tinyusb/src/common/tusb_common.h
+7 −0		tinyusb/src/common/tusb_types.h
+5 −5		tinyusb/src/common/tusb_verify.h
+11 −4		tinyusb/src/device/dcd.h
+139 −108		tinyusb/src/device/usbd.c
+100 −13		tinyusb/src/device/usbd.h
+26 −9		tinyusb/src/device/usbd_control.c
+1 −0		tinyusb/src/device/usbd_pvt.h
+8 −6		tinyusb/src/osal/osal.h
+741 −0		tinyusb/src/portable/espressif/esp32s2/dcd_esp32s2.c
+14 −58		tinyusb/src/portable/microchip/samd/dcd_samd.c
+471 −0		tinyusb/src/portable/microchip/samg/dcd_samg.c
+254 −12		tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c
+0 −255		tinyusb/src/portable/nordic/nrf5x/hal_nrf5x.c
+435 −0		tinyusb/src/portable/nuvoton/nuc120/dcd_nuc120.c
+451 −0		tinyusb/src/portable/nuvoton/nuc121/dcd_nuc121.c
+652 −0		tinyusb/src/portable/nuvoton/nuc505/dcd_nuc505.c
+579 −0		tinyusb/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
+152 −0		tinyusb/src/portable/nxp/lpc17_40/dcd_lpc17_40.h
+46 −0		tinyusb/src/portable/nxp/lpc17_40/hcd_lpc17_40.c
+50 −0		tinyusb/src/portable/nxp/lpc18_43/hcd_lpc18_43.c
+415 −0		tinyusb/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
+583 −0		tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c
+335 −0		tinyusb/src/portable/sony/cxd56/dcd_cxd56.c
+920 −0		tinyusb/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+403 −0		tinyusb/src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h
+757 −0		tinyusb/src/portable/st/synopsys/dcd_synopsys.c
+640 −0		tinyusb/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
+643 −0		tinyusb/src/portable/valentyusb/eptri/dcd_eptri.c
+39 −0		tinyusb/src/portable/valentyusb/eptri/dcd_eptri.h
+5 −5		tinyusb/src/tusb.c
+4 −0		tinyusb/src/tusb.h
+22 −3		tinyusb/src/tusb_option.h