Merge pull request #12338 from cladmi/pr/make/cortexm/do_not_set_cpu_…

…model makefiles/arch/cortexm.inc.mk: removing setting CPU_MODEL
RIOT-OS · Oct 1, 2019 · 5f6065f · 5f6065f
2 parents 1663c49 + 3a938d4
commit 5f6065f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cpu/lpc1768/Makefile.features b/cpu/lpc1768/Makefile.features
@@ -1,3 +1,5 @@
+# This CPU only implements one CPU_MODEL with the same name
+CPU_MODEL = lpc1768
 FEATURES_PROVIDED += periph_cpuid
 FEATURES_PROVIDED += periph_pm
 

diff --git a/makefiles/arch/cortexm.inc.mk b/makefiles/arch/cortexm.inc.mk
@@ -1,3 +1,7 @@
+ifeq (,$(CPU_MODEL))
+  $(error CPU_MODEL must have been defined by the board/cpu Makefile.features)
+endif
+
 # Target triple for the build. Use arm-none-eabi if you are unsure.
 export TARGET_ARCH ?= arm-none-eabi
 
@@ -39,9 +43,6 @@ export USEMODULE += cortexm_common_periph
 # all cortex MCU's use newlib as libc
 export USEMODULE += newlib
 
-# set default for CPU_MODEL
-export CPU_MODEL ?= $(CPU)
-
 
 # extract version inside the first parentheses
 ARM_GCC_VERSION = $(shell $(TARGET_ARCH)-gcc --version | sed -n '1 s/[^(]*(\([^\)]*\)).*/\1/p')