Skip to content

feat: add CMSIS_6 support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpistm merged 2 commits into from
Dec 8, 2025
Merged

feat: add CMSIS_6 support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d55da2
feat: add CMSIS 6 support
fpistm Nov 19, 2025
fa91567
feat: add cmsis6, dsp and nn makefile targets
fpistm Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*.swp
CMSIS-*.tar.bz2
CMSIS*-*.tar.bz2
package_CMSIS_*_index.json
9 changes: 9 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[submodule "CMSIS_5"]
path = CMSIS_5
url = https://github.com/ARM-software/CMSIS_5.git
[submodule "CMSIS_6"]
path = CMSIS_6
url = https://github.com/ARM-software/CMSIS_6.git
[submodule "CMSIS-NN"]
path = CMSIS-NN
url = https://github.com/ARM-software/CMSIS-NN
[submodule "CMSIS-DSP"]
path = CMSIS-DSP
url = https://github.com/ARM-software/CMSIS-DSP
1 change: 1 addition & 0 deletions CMSIS-DSP
Open in desktop
Submodule CMSIS-DSP added at d5717e
1 change: 1 addition & 0 deletions CMSIS-NN
Open in desktop
Submodule CMSIS-NN added at 22080c
1 change: 1 addition & 0 deletions CMSIS_6
Open in desktop
Submodule CMSIS_6 added at 6f0a58
87 changes: 80 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ ROOT_PATH := .

OS ?=$(shell uname -s)

PACKAGE_NAME := "CMSIS"

# -----------------------------------------------------------------------------
# packaging specific

Expand All @@ -40,14 +38,89 @@ endif
# end of packaging specific
# -----------------------------------------------------------------------------

.PHONY: all clean cmsis5 print_info postpackaging
.PHONY: all clean cmsis5 cmsis6 cmsis_dsp cmsis_nn print_info postpackaging

# Arduino module packaging:
# - exclude version control system files, here git files and folders .git, .gitattributes and .gitignore
# - exclude 'extras' folder
all: cmsis5
all: cmsis6 cmsis_dsp cmsis_nn

cmsis6: PACKAGE_NAME := "CMSIS"
cmsis6: PACKAGE_FOLDER := CMSIS_6
cmsis6: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags | sed 's/^v//')
cmsis6: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
cmsis6: clean print_info
@echo ----------------------------------------------------------
@echo "Packaging module."
@tar --mtime='$(PACKAGE_DATE)' \
--exclude=.github \
--exclude=CMSIS/CoreValidation \
--exclude=CMSIS/Documentation \
--exclude=CMSIS/Driver \
--exclude=.git \
--exclude=.gitignore \
--exclude=gen_pack.sh \
--exclude=.devcontainer \
--transform "s|CMSIS_6|CMSIS|" \
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C .
@echo ----------------------------------------------------------

cmsis_dsp: PACKAGE_NAME := "CMSIS_DSP"
cmsis_dsp: PACKAGE_FOLDER := CMSIS-DSP
cmsis_dsp: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags | sed 's/^v//')
cmsis_dsp: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
cmsis_dsp: clean print_info
@echo ----------------------------------------------------------
@echo "Packaging module."
@tar --mtime='$(PACKAGE_DATE)' \
--exclude=.github \
--exclude=cmsisdsp \
--exclude=Documentation \
--exclude=dsppp \
--exclude=Examples \
--exclude=PythonWrapper \
--exclude=Scripts \
--exclude=Testing \
--exclude=.git \
--exclude=.gitignore \
--exclude=CMakeLists.txt \
--exclude=gen_pack.sh \
--exclude=MANIFEST.in \
--exclude=pyproject.toml \
--exclude=PythonWrapper_README.md \
--exclude=setup.py \
--exclude=vcpkg-configuration.json \
--transform "s|CMSIS-DSP|CMSIS_DSP|" \
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C .
@echo ----------------------------------------------------------

cmsis_nn: PACKAGE_NAME := "CMSIS_NN"
cmsis_nn: PACKAGE_FOLDER := CMSIS-NN
cmsis_nn: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags | sed 's/^v//')
cmsis_nn: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
cmsis_nn: clean print_info
@echo ----------------------------------------------------------
@echo "Packaging module."
@tar --mtime='$(PACKAGE_DATE)' \
--exclude=.github \
--exclude=Documentation \
--exclude=Examples \
--exclude=Tests \
--exclude=.git \
--exclude=.clang-format \
--exclude=.gitignore \
--exclude=check_pdsc.sh \
--exclude=check_version_and_date.sh \
--exclude=CMakeLists.txt \
--exclude=gen_pack.sh \
--transform "s|CMSIS-NN|CMSIS_NN|" \
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C .
@echo ----------------------------------------------------------

cmsis5: PACKAGE_NAME := "CMSIS"
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))
Expand Down Expand Up @@ -102,13 +175,13 @@ cmsis5: clean print_info
--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 .
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C .
@echo ----------------------------------------------------------

clean:
@echo ----------------------------------------------------------
@echo Cleanup
-$(RM) $(PACKAGE_NAME)-*.tar.bz2 package_$(PACKAGE_NAME)_*.json test_package_$(PACKAGE_NAME)_*.json
-$(RM) CMSIS*-*.tar.bz2 package_CMSIS*_*.json test_package_CMSIS*_*.json
@echo ----------------------------------------------------------

print_info:
Expand All @@ -126,5 +199,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/%%PACKAGENAME%%/$(PACKAGE_NAME)/ | 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"
19 changes: 6 additions & 13 deletions extras/package_index.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,38 @@
{
"name": "CMSIS",
"name": "%%PACKAGENAME%%",
"version": "%%VERSION%%",
"systems":
[
{
"host": "i686-mingw32",
"url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%",
"archiveFileName": "%%FILENAME%%",
"checksum": "SHA-256:%%CHECKSUM%%",
"size": "%%SIZE%%"
},
{
"host": "x86_64-apple-darwin",
"host": "aarch64-linux-gnu",
"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",
"host": "arm64-apple-darwin",
"url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%",
"archiveFileName": "%%FILENAME%%",
"checksum": "SHA-256:%%CHECKSUM%%",
"size": "%%SIZE%%"
},
{
"host": "i686-pc-linux-gnu",
"host": "i686-mingw32",
"url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%",
"archiveFileName": "%%FILENAME%%",
"checksum": "SHA-256:%%CHECKSUM%%",
"size": "%%SIZE%%"
},
{
"host": "arm-linux-gnueabihf",
"host": "x86_64-apple-darwin",
"url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%",
"archiveFileName": "%%FILENAME%%",
"checksum": "SHA-256:%%CHECKSUM%%",
"size": "%%SIZE%%"
},
{
"host": "all",
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/%%VERSION%%/%%FILENAME%%",
"archiveFileName": "%%FILENAME%%",
"checksum": "SHA-256:%%CHECKSUM%%",
Expand Down