From 836db2690384b03e948d89869ddb9c3cd9f213a5 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Thu, 5 Dec 2019 17:44:12 +0100 Subject: [PATCH 1/7] Update CMSIS_5 to 5.6.0 Signed-off-by: Frederic Pillon --- CMSIS_5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMSIS_5 b/CMSIS_5 index ca81242..b5f0603 160000 --- a/CMSIS_5 +++ b/CMSIS_5 @@ -1 +1 @@ -Subproject commit ca812421550b53a0bdd79139e255293ded03968f +Subproject commit b5f0603d6a584d1724d952fd8b0737458b90d62b From d978b463d70f1d6f08641fd4ddebbffb995502e3 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Wed, 28 Oct 2020 18:04:54 +0100 Subject: [PATCH 2/7] Update CMSIS_5 to 5.7.0 Signed-off-by: Frederic Pillon --- CMSIS_5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMSIS_5 b/CMSIS_5 index b5f0603..a65b7c9 160000 --- a/CMSIS_5 +++ b/CMSIS_5 @@ -1 +1 @@ -Subproject commit b5f0603d6a584d1724d952fd8b0737458b90d62b +Subproject commit a65b7c9a3e6502127fdb80eb288d8cbdf251a6f4 From f765dbecd1cdc84b35e123bf334e30f0ff3f7537 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Thu, 29 Oct 2020 10:30:25 +0100 Subject: [PATCH 3/7] Update Makefile to package CMSIS 5 Package size increase more and more. Remove useless folders and files not required for STM32duino Signed-off-by: Frederic Pillon --- Makefile | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cb7ebaf..86f3bc5 100644 --- a/Makefile +++ b/Makefile @@ -82,21 +82,46 @@ cmsis5: clean print_info --exclude=CMSIS/DSP/Lib/ARM \ --exclude=CMSIS/DSP/Lib/ARMCLANG \ --exclude=CMSIS/DSP/Lib/IAR \ + --exclude=CMSIS/DSP/Platforms \ --exclude=CMSIS/DSP/Projects \ + --exclude=CMSIS/DSP/PythonWrapper \ + --exclude=CMSIS/DSP/Scripts \ + --exclude=CMSIS/DSP/Testing \ + --exclude=CMSIS/DSP/Toolchain \ --exclude=CMSIS/NN/Examples \ --exclude=CMSIS/NN/NN_Lib_Tests \ + --exclude=CMSIS/NN/Scripts \ + --exclude=CMSIS/NN/Tests \ --exclude=CMSIS/Pack \ --exclude=CMSIS/RTOS/RTX/Library/ARM \ + --exclude=CMSIS/RTOS/RTX/LIB/ARM \ --exclude=CMSIS/RTOS/RTX/Library/IAR \ - --exclude=CMSIS/RTOS2/RTX/Examples \ + --exclude=CMSIS/RTOS/RTX/LIB/IAR \ + --exclude=CMSIS/RTOS/RTX/SRC/ARM \ + --exclude=CMSIS/RTOS/RTX/SRC/IAR \ + --exclude=CMSIS/RTOS2/RTX/Examples* \ --exclude=CMSIS/RTOS2/RTX/Library/ARM \ --exclude=CMSIS/RTOS2/RTX/Library/IAR \ + --exclude=CMSIS/RTOS2/RTX/Source/ARM \ + --exclude=CMSIS/RTOS2/RTX/Source/IAR \ --exclude=CMSIS/Utilities \ + --exclude=Device/_Template_Vendor/Vendor/Device/Source/ARM \ + --exclude=Device/_Template_Vendor/Vendor/Device/Source/IAR \ + --exclude=Device/_Template_Vendor/Vendor/Device_A \ + --exclude=Device/ARM/*/Source/AC5 \ + --exclude=Device/ARM/*/Source/AC6 \ + --exclude=Device/ARM/*/Source/ARM \ + --exclude=Device/ARM/*/Source/IAR \ + --exclude=Device/Utilities \ + --exclude=*.cmake \ + --exclude=CMakeLists.txt \ --exclude=.git \ --exclude=.gitignore \ --exclude=.gitattributes \ --exclude=manifest \ --exclude=*.pdf \ + --exclude=*.py \ + --exclude=*.scvd \ --transform "s|CMSIS_5|CMSIS|" \ -cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)" $(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C . From 43da24adca105e74d4061514cea381a06d277f7f Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Wed, 22 Jun 2022 15:57:48 +0200 Subject: [PATCH 4/7] doc: update links --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9348f1b..7abf07a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # ArduinoModule-CMSIS ARM CMSIS module for Arduino IDE -Source is the one provided by ARM at https://github.com/ARM-software/CMSIS/ +Source is the one provided by ARM at: + * CMSIS 4 (legacy): https://github.com/ARM-software/CMSIS/ + * CMSIS 5: https://github.com/ARM-software/CMSIS_5 -Main CMSIS URL is http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php +Main CMSIS URL is https://developer.arm.com/tools-and-software/embedded/cmsis -API Help can be found at http://www.keil.com/pack/doc/cmsis/general/html/index.html +API Help can be found at https://arm-software.github.io/CMSIS_5/General/html/index.html From ae017293e7dc4f5902ac8ae64ddc1f827e25ec2a Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Fri, 4 Aug 2023 16:31:13 +0200 Subject: [PATCH 5/7] chore: update CMSIS_5 to 5.9.0 Signed-off-by: Frederic Pillon --- CMSIS_5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMSIS_5 b/CMSIS_5 index a65b7c9..2b7495b 160000 --- a/CMSIS_5 +++ b/CMSIS_5 @@ -1 +1 @@ -Subproject commit a65b7c9a3e6502127fdb80eb288d8cbdf251a6f4 +Subproject commit 2b7495b8535bdcb306dac29b9ded4cfb679d7e5c From 4709668d71c1d3189429d859aaf0e2f39428189b Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Mon, 7 Aug 2023 17:19:39 +0200 Subject: [PATCH 6/7] chore: drop old CMSIS support Signed-off-by: Frederic Pillon --- .gitmodules | 3 --- CMSIS | 1 - Makefile | 21 ++------------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 160000 CMSIS diff --git a/.gitmodules b/.gitmodules index 470eb65..b46f77c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "ARM_CMSIS"] - path = CMSIS - url = https://github.com/ARM-software/CMSIS.git [submodule "CMSIS_5"] path = CMSIS_5 url = https://github.com/ARM-software/CMSIS_5.git diff --git a/CMSIS b/CMSIS deleted file mode 160000 index 8c0e1a9..0000000 --- a/CMSIS +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c0e1a91341cde86532b05625f2ad584ce856118 diff --git a/Makefile b/Makefile index 86f3bc5..c8d7d3d 100644 --- a/Makefile +++ b/Makefile @@ -40,30 +40,13 @@ endif # end of packaging specific # ----------------------------------------------------------------------------- -.PHONY: all clean cmsis cmsis5 print_info postpackaging +.PHONY: all clean cmsis5 print_info postpackaging # Arduino module packaging: # - exclude version control system files, here git files and folders .git, .gitattributes and .gitignore # - exclude 'extras' folder -all: cmsis cmsis5 +all: cmsis5 -cmsis: PACKAGE_VERSION := 4.5.0 -cmsis: PACKAGE_FOLDER := CMSIS -cmsis: clean print_info - @echo ---------------------------------------------------------- - @echo "Packaging module." - @tar --exclude=./.gitattributes \ - --exclude=./.travis.yml \ - --exclude=CMSIS/index.html \ - --exclude=CMSIS/Documentation \ - --exclude=CMSIS/Pack \ - --exclude=CMSIS/Utilities \ - --exclude=CMSIS/DSP_Lib/Examples \ - --exclude=Device/ARM/Documents \ - --exclude=.git \ - -cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)" - $(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C . - @echo ---------------------------------------------------------- cmsis5: PACKAGE_FOLDER := CMSIS_5 cmsis5: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags) From c1bfbe52c482f4d30e1cb02b9a1a31f8e789f063 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Wed, 9 Aug 2023 16:52:38 +0200 Subject: [PATCH 7/7] chore: update Makfefile for 5.9.0 Signed-off-by: Frederic Pillon --- Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c8d7d3d..8f0dcd4 100644 --- a/Makefile +++ b/Makefile @@ -60,26 +60,19 @@ cmsis5: clean print_info --exclude=CMSIS/Documentation \ --exclude=CMSIS/DoxyGen \ --exclude=CMSIS/DAP/Firmware/Examples/ \ - --exclude=CMSIS/DSP/DSP_Lib_TestSuite \ + --exclude=CMSIS/DSP/cmsisdsp \ --exclude=CMSIS/DSP/Examples \ - --exclude=CMSIS/DSP/Lib/ARM \ - --exclude=CMSIS/DSP/Lib/ARMCLANG \ - --exclude=CMSIS/DSP/Lib/IAR \ --exclude=CMSIS/DSP/Platforms \ - --exclude=CMSIS/DSP/Projects \ --exclude=CMSIS/DSP/PythonWrapper \ --exclude=CMSIS/DSP/Scripts \ + --exclude=CMSIS/DSP/SDFTools \ --exclude=CMSIS/DSP/Testing \ --exclude=CMSIS/DSP/Toolchain \ --exclude=CMSIS/NN/Examples \ - --exclude=CMSIS/NN/NN_Lib_Tests \ --exclude=CMSIS/NN/Scripts \ --exclude=CMSIS/NN/Tests \ --exclude=CMSIS/Pack \ - --exclude=CMSIS/RTOS/RTX/Library/ARM \ - --exclude=CMSIS/RTOS/RTX/LIB/ARM \ - --exclude=CMSIS/RTOS/RTX/Library/IAR \ - --exclude=CMSIS/RTOS/RTX/LIB/IAR \ + --exclude=CMSIS/RTOS/RTX/LIB \ --exclude=CMSIS/RTOS/RTX/SRC/ARM \ --exclude=CMSIS/RTOS/RTX/SRC/IAR \ --exclude=CMSIS/RTOS2/RTX/Examples* \ @@ -96,11 +89,13 @@ cmsis5: clean print_info --exclude=Device/ARM/*/Source/ARM \ --exclude=Device/ARM/*/Source/IAR \ --exclude=Device/Utilities \ + --exclude=docker \ --exclude=*.cmake \ --exclude=CMakeLists.txt \ --exclude=.git \ --exclude=.gitignore \ --exclude=.gitattributes \ + --exclude=.github \ --exclude=manifest \ --exclude=*.pdf \ --exclude=*.py \