From 268e763d6368ceec20ff6fb6ddefd2b94fcd50e6 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 7 Nov 2017 12:27:13 +0100
Subject: [PATCH] make: move mcuboot related stuff to makefiles/mcuboot.mk

---
 Makefile.include                       | 4 ++--
 cpu/cortexm_common/Makefile.include    | 2 --
 makefiles/{multislot.mk => mcuboot.mk} | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename makefiles/{multislot.mk => mcuboot.mk} (98%)

diff --git a/Makefile.include b/Makefile.include
index b2c2125883..d87802d7d2 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -567,6 +567,6 @@ CFLAGS := $(patsubst -D%,,$(CFLAGS))
 CFLAGS := $(patsubst -U%,,$(CFLAGS))
 CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)'
 
-# include multislot support
-include $(RIOTMAKE)/multislot.mk
+# include mcuboot support
+include $(RIOTMAKE)/mcuboot.mk
 endif # BOARD=none
diff --git a/cpu/cortexm_common/Makefile.include b/cpu/cortexm_common/Makefile.include
index ee70e1b686..b0b21710b5 100644
--- a/cpu/cortexm_common/Makefile.include
+++ b/cpu/cortexm_common/Makefile.include
@@ -1,5 +1,3 @@
 # include module specific includes
 INCLUDES += -I$(RIOTCPU)/cortexm_common/include
 INCLUDES += -I$(RIOTCPU)/cortexm_common/include/vendor
-
-export IMAGE_HDR_SIZE ?= 512
diff --git a/makefiles/multislot.mk b/makefiles/mcuboot.mk
similarity index 98%
rename from makefiles/multislot.mk
rename to makefiles/mcuboot.mk
index 94fb5f35d8..25eeb786c7 100644
--- a/makefiles/multislot.mk
+++ b/makefiles/mcuboot.mk
@@ -11,6 +11,8 @@ MCUBOOT_BIN ?= $(BINDIR)/mcuboot.bin
 MCUBOOT_BIN_URL ?= http://download.riot-os.org/mynewt.mcuboot.bin
 MCUBOOT_BIN_MD5 ?= 0c71a0589bd3709fc2d90f07a0035ce7
 
+export IMAGE_HDR_SIZE ?= 512
+
 create-key: $(MCUBOOT_KEYFILE)
 
 ifeq ($(BINDIR)/key.pem,$(MCUBOOT_KEYFILE))
-- 
GitLab