Skip to content

Add CMSIS 5 support #1

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
merged 5 commits into from
Aug 14, 2018
Merged

Add CMSIS 5 support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03c87ff
Adding .gitignore
fpistm Mar 12, 2018
6f22b18
Updated url of CMSIS
fpistm Mar 12, 2018
e323674
Adding ARM CMSIS_5 as submodule
fpistm Mar 19, 2018
ebf2061
Update Makefile to package CMSIS 5
fpistm Mar 19, 2018
50d200d
Update Makefile to get CMSIS 5 version from git
fpistm Mar 30, 2018
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.swp
CMSIS-*.tar.bz2
package_CMSIS_*_index.json
5 changes: 4 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "ARM_CMSIS"]
path = CMSIS
url = git@github.com:ARM-software/CMSIS.git
url = https://github.com/ARM-software/CMSIS.git
[submodule "CMSIS_5"]
path = CMSIS_5
url = https://github.com/ARM-software/CMSIS_5.git
1 change: 1 addition & 0 deletions CMSIS_5
Open in desktop
Submodule CMSIS_5 added at 49ac52
52 changes: 43 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,15 +40,19 @@ 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 \
@tar --exclude=./.gitattributes \
--exclude=./.travis.yml \
--exclude=CMSIS/index.html \
--exclude=CMSIS/Documentation \
Expand All @@ -59,7 +62,36 @@ 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_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 --mtime='$(PACKAGE_DATE)' \
--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:
Expand All @@ -74,12 +106,14 @@ 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)"
@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"