kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2026-01-01 01:41:18 +01:00
Code Releases Activity

Merge pull request #12338 from cladmi/pr/make/cortexm/do_not_set_cpu_model

Browse Source 
makefiles/arch/cortexm.inc.mk: removing setting CPU_MODEL
This commit is contained in:
benpicco 2019-10-01 15:25:16 +02:00 committed by GitHub
commit 5f6065f567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/lpc1768/Makefile.features
View File

@ -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

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.
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')