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

makefiles/arch/cortexm.inc.mk: removing setting CPU_MODEL

Browse Source 
All cortexm boards should now define it on there own.
This commit is contained in:
Gaëtan Harter 2019-06-11 14:50:03 +02:00
parent e73b4d2d24
commit 3a938d43e7
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefiles/arch/cortexm.inc.mk
View File

@ -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. # Target triple for the build. Use arm-none-eabi if you are unsure.
export TARGET_ARCH ?= arm-none-eabi export TARGET_ARCH ?= arm-none-eabi
@ -39,9 +43,6 @@ export USEMODULE += cortexm_common_periph
# all cortex MCU's use newlib as libc # all cortex MCU's use newlib as libc
export USEMODULE += newlib export USEMODULE += newlib
# set default for CPU_MODEL
export CPU_MODEL ?= $(CPU)
# extract version inside the first parentheses # extract version inside the first parentheses
ARM_GCC_VERSION = $(shell $(TARGET_ARCH)-gcc --version | sed -n '1 s/[^(]*(\([^\)]*\)).*/\1/p') ARM_GCC_VERSION = $(shell $(TARGET_ARCH)-gcc --version | sed -n '1 s/[^(]*(\([^\)]*\)).*/\1/p')