From 03c87ff4a0d77611b5082f9e374672fbfa5f2891 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Mon, 12 Mar 2018 14:20:24 +0100 Subject: [PATCH 01/16] Adding .gitignore Signed-off-by: Frederic.Pillon --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..11eecab --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.swp +CMSIS-*.tar.bz2 +package_CMSIS_*_index.json From 6f22b183b1b9765559096c23bab43a9ac86690da Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Mon, 12 Mar 2018 11:10:06 +0100 Subject: [PATCH 02/16] Updated url of CMSIS Signed-off-by: Frederic.Pillon --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 88f0084..b56a81c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ARM_CMSIS"] path = CMSIS - url = git@github.com:ARM-software/CMSIS.git + url = https://github.com/ARM-software/CMSIS.git From e3236747b046e11c4fd24702d9a9e92d1aa07a09 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Mon, 19 Mar 2018 10:07:11 +0100 Subject: [PATCH 03/16] Adding ARM CMSIS_5 as submodule Signed-off-by: Frederic.Pillon --- .gitmodules | 3 +++ CMSIS_5 | 1 + 2 files changed, 4 insertions(+) create mode 160000 CMSIS_5 diff --git a/.gitmodules b/.gitmodules index b56a81c..470eb65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [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_5 b/CMSIS_5 new file mode 160000 index 0000000..49ac527 --- /dev/null +++ b/CMSIS_5 @@ -0,0 +1 @@ +Subproject commit 49ac527aa7406cecbba46d4d3bdbc7f60c6c6d42 From ebf20610a8711d14893e5e7b1a79bb1879fd06c7 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Mon, 19 Mar 2018 16:03:27 +0100 Subject: [PATCH 04/16] Update Makefile to package CMSIS 5 Signed-off-by: Frederic.Pillon --- Makefile | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 65b82fb..84f2559 100644 --- a/Makefile +++ b/Makefile @@ -24,13 +24,12 @@ SHELL = /bin/sh ROOT_PATH := . -#PACKAGE_NAME := $(basename $(notdir $(CURDIR))) +OS ?=$(shell uname -s) + PACKAGE_NAME := "CMSIS" -PACKAGE_VERSION := 4.5.0 # ----------------------------------------------------------------------------- # packaging specific -PACKAGE_FOLDER := CMSIS ifeq (postpackaging,$(findstring $(MAKECMDGOALS),postpackaging)) PACKAGE_FILENAME=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 @@ -41,12 +40,16 @@ endif # end of packaging specific # ----------------------------------------------------------------------------- -.PHONY: all clean print_info postpackaging +.PHONY: all clean cmsis 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: clean print_info +all: cmsis cmsis5 + +cmsis: PACKAGE_VERSION := 4.5.0 +cmsis: PACKAGE_FOLDER := CMSIS +cmsis: clean print_info @echo ---------------------------------------------------------- @echo "Packaging module." tar --exclude=./.gitattributes \ @@ -59,7 +62,34 @@ all: clean print_info --exclude=Device/ARM/Documents \ --exclude=.git \ -cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)" - $(MAKE) --no-builtin-rules postpackaging -C . + $(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C . + @echo ---------------------------------------------------------- + +cmsis5: PACKAGE_VERSION := 5.3.0 +cmsis5: PACKAGE_FOLDER := CMSIS_5 +cmsis5: clean print_info + @echo ---------------------------------------------------------- + @echo "Packaging module." + tar --exclude=docs \ + --exclude=CMSIS/CoreValidation \ + --exclude=CMSIS/Documentation \ + --exclude=CMSIS/DoxyGen \ + --exclude=CMSIS/NN/Examples \ + --exclude=CMSIS/NN/NN_Lib_Tests \ + --exclude=CMSIS/Pack \ + --exclude=CMSIS/Utilities \ + --exclude=CMSIS/DSP/DSP_Lib_TestSuite \ + --exclude=CMSIS/DSP/Examples \ + --exclude=CMSIS/DSP/Projects \ + --exclude=Device/ARM/Documents \ + --exclude=.git \ + --exclude=.gitignore \ + --exclude=.gitattributes \ + --exclude=manifest \ + --exclude=*.pdf \ + --transform "s|CMSIS_5|CMSIS|" \ + -cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)" + $(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C . @echo ---------------------------------------------------------- clean: @@ -74,8 +104,10 @@ print_info: @echo "CURDIR = $(CURDIR)" @echo "OS = $(OS)" @echo "SHELL = $(SHELL)" - @echo "PACKAGE_VERSION = $(PACKAGE_VERSION)" @echo "PACKAGE_NAME = $(PACKAGE_NAME)" + @echo "PACKAGE_FOLDER = $(PACKAGE_FOLDER)" + @echo "PACKAGE_VERSION = $(PACKAGE_VERSION)" + postpackaging: @echo "PACKAGE_CHKSUM = $(PACKAGE_CHKSUM)" From 50d200d8e88153bc89db19e71ff29dcf3b711237 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Fri, 30 Mar 2018 13:50:32 +0200 Subject: [PATCH 05/16] Update Makefile to get CMSIS 5 version from git Use commit date to always generate the same package using tar. Signed-off-by: Frederic.Pillon --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 84f2559..f0cb776 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ cmsis: PACKAGE_FOLDER := CMSIS cmsis: clean print_info @echo ---------------------------------------------------------- @echo "Packaging module." - tar --exclude=./.gitattributes \ + @tar --exclude=./.gitattributes \ --exclude=./.travis.yml \ --exclude=CMSIS/index.html \ --exclude=CMSIS/Documentation \ @@ -65,12 +65,14 @@ cmsis: clean print_info $(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C . @echo ---------------------------------------------------------- -cmsis5: PACKAGE_VERSION := 5.3.0 cmsis5: PACKAGE_FOLDER := CMSIS_5 +cmsis5: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags) +cmsis5: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci)) cmsis5: clean print_info @echo ---------------------------------------------------------- @echo "Packaging module." - tar --exclude=docs \ + @tar --mtime='$(PACKAGE_DATE)' \ + --exclude=docs \ --exclude=CMSIS/CoreValidation \ --exclude=CMSIS/Documentation \ --exclude=CMSIS/DoxyGen \ @@ -113,5 +115,5 @@ postpackaging: @echo "PACKAGE_CHKSUM = $(PACKAGE_CHKSUM)" @echo "PACKAGE_SIZE = $(PACKAGE_SIZE)" @echo "PACKAGE_FILENAME = $(PACKAGE_FILENAME)" - cat extras/package_index.json.template | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json + @cat extras/package_index.json.template | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json @echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created" From 32ae593233c747554ff8b145c7b540af6a486092 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Mon, 25 Feb 2019 17:47:00 +0100 Subject: [PATCH 06/16] Update to CMSIS_5 5.4.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 49ac527..0b52176 160000 --- a/CMSIS_5 +++ b/CMSIS_5 @@ -1 +1 @@ -Subproject commit 49ac527aa7406cecbba46d4d3bdbc7f60c6c6d42 +Subproject commit 0b521765067ac87b142cd96b5f578ffb399090cc From d15a9c3ddbc3e36cba596ccd79ebf53c5371aa9c Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Fri, 29 Mar 2019 07:27:31 +0100 Subject: [PATCH 07/16] Change Github id in JSON template URL's Signed-off-by: Frederic.Pillon --- extras/package_index.json.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/package_index.json.template b/extras/package_index.json.template index 0b3cfef..9045a86 100644 --- a/extras/package_index.json.template +++ b/extras/package_index.json.template @@ -5,42 +5,42 @@ [ { "host": "i686-mingw32", - "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%", + "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%", "archiveFileName": "%%FILENAME%%", "checksum": "SHA-256:%%CHECKSUM%%", "size": "%%SIZE%%" }, { "host": "x86_64-apple-darwin", - "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%", + "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%", "archiveFileName": "%%FILENAME%%", "checksum": "SHA-256:%%CHECKSUM%%", "size": "%%SIZE%%" }, { "host": "x86_64-pc-linux-gnu", - "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%", + "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%", "archiveFileName": "%%FILENAME%%", "checksum": "SHA-256:%%CHECKSUM%%", "size": "%%SIZE%%" }, { "host": "i686-pc-linux-gnu", - "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%", + "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%", "archiveFileName": "%%FILENAME%%", "checksum": "SHA-256:%%CHECKSUM%%", "size": "%%SIZE%%" }, { "host": "arm-linux-gnueabihf", - "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%", + "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%", "archiveFileName": "%%FILENAME%%", "checksum": "SHA-256:%%CHECKSUM%%", "size": "%%SIZE%%" }, { "host": "all", - "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%", + "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%", "archiveFileName": "%%FILENAME%%", "checksum": "SHA-256:%%CHECKSUM%%", "size": "%%SIZE%%" From 374e2094a9152b1859ae243e04c0f56cbd4b3887 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Fri, 29 Mar 2019 15:45:52 +0100 Subject: [PATCH 08/16] Update CMSIS_5 to 5.5.1 Signed-off-by: Frederic.Pillon --- CMSIS_5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMSIS_5 b/CMSIS_5 index 0b52176..ca81242 160000 --- a/CMSIS_5 +++ b/CMSIS_5 @@ -1 +1 @@ -Subproject commit 0b521765067ac87b142cd96b5f578ffb399090cc +Subproject commit ca812421550b53a0bdd79139e255293ded03968f From f3cd9fb008085c7c49ca4c87efb9ef741738827f Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Tue, 2 Apr 2019 11:07:27 +0200 Subject: [PATCH 09/16] Update Makefile to package CMSIS 5 Package size increase more and more. Remove useless folders not required for STM32duino Signed-off-by: Frederic.Pillon --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f0cb776..cb7ebaf 100644 --- a/Makefile +++ b/Makefile @@ -76,14 +76,22 @@ cmsis5: clean print_info --exclude=CMSIS/CoreValidation \ --exclude=CMSIS/Documentation \ --exclude=CMSIS/DoxyGen \ + --exclude=CMSIS/DAP/Firmware/Examples/ \ + --exclude=CMSIS/DSP/DSP_Lib_TestSuite \ + --exclude=CMSIS/DSP/Examples \ + --exclude=CMSIS/DSP/Lib/ARM \ + --exclude=CMSIS/DSP/Lib/ARMCLANG \ + --exclude=CMSIS/DSP/Lib/IAR \ + --exclude=CMSIS/DSP/Projects \ --exclude=CMSIS/NN/Examples \ --exclude=CMSIS/NN/NN_Lib_Tests \ --exclude=CMSIS/Pack \ + --exclude=CMSIS/RTOS/RTX/Library/ARM \ + --exclude=CMSIS/RTOS/RTX/Library/IAR \ + --exclude=CMSIS/RTOS2/RTX/Examples \ + --exclude=CMSIS/RTOS2/RTX/Library/ARM \ + --exclude=CMSIS/RTOS2/RTX/Library/IAR \ --exclude=CMSIS/Utilities \ - --exclude=CMSIS/DSP/DSP_Lib_TestSuite \ - --exclude=CMSIS/DSP/Examples \ - --exclude=CMSIS/DSP/Projects \ - --exclude=Device/ARM/Documents \ --exclude=.git \ --exclude=.gitignore \ --exclude=.gitattributes \ From 836db2690384b03e948d89869ddb9c3cd9f213a5 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Thu, 5 Dec 2019 17:44:12 +0100 Subject: [PATCH 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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 \