riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: move mcuboot related stuff to makefiles/mcuboot.mk

Browse Source
This commit is contained in:
Kaspar Schleiser 2017-11-07 12:27:13 +01:00
parent 2c19595b7e
commit 268e763d63
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.include
View File

@ -567,6 +567,6 @@ CFLAGS := $(patsubst -D%,,$(CFLAGS))
CFLAGS := $(patsubst -U%,,$(CFLAGS)) CFLAGS := $(patsubst -U%,,$(CFLAGS))
CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)' CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)'
# include multislot support # include mcuboot support
include $(RIOTMAKE)/multislot.mk include $(RIOTMAKE)/mcuboot.mk
endif # BOARD=none endif # BOARD=none

2
cpu/cortexm_common/Makefile.include
View File

@ -1,5 +1,3 @@
# include module specific includes # include module specific includes
INCLUDES += -I$(RIOTCPU)/cortexm_common/include INCLUDES += -I$(RIOTCPU)/cortexm_common/include
INCLUDES += -I$(RIOTCPU)/cortexm_common/include/vendor INCLUDES += -I$(RIOTCPU)/cortexm_common/include/vendor
export IMAGE_HDR_SIZE ?= 512

2
makefiles/multislot.mk → makefiles/mcuboot.mk
View File

@ -11,6 +11,8 @@ MCUBOOT_BIN ?= $(BINDIR)/mcuboot.bin
MCUBOOT_BIN_URL ?= http://download.riot-os.org/mynewt.mcuboot.bin MCUBOOT_BIN_URL ?= http://download.riot-os.org/mynewt.mcuboot.bin
MCUBOOT_BIN_MD5 ?= 0c71a0589bd3709fc2d90f07a0035ce7 MCUBOOT_BIN_MD5 ?= 0c71a0589bd3709fc2d90f07a0035ce7
export IMAGE_HDR_SIZE ?= 512
create-key: $(MCUBOOT_KEYFILE) create-key: $(MCUBOOT_KEYFILE)
ifeq ($(BINDIR)/key.pem,$(MCUBOOT_KEYFILE)) ifeq ($(BINDIR)/key.pem,$(MCUBOOT_KEYFILE))