Skip to content

Commit

Permalink
TODO See which boards are affected by this. Makefile.features: set CP…
Browse files Browse the repository at this point in the history
…U_MODEL to be by default CPU

This was done globally in 'makefiles/arch/cortexm.inc.mk'.
  • Loading branch information
cladmi committed Aug 26, 2019
1 parent 84bd111 commit e94b04c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 4 additions & 0 deletions Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ ifeq (,$(CPU))
$(error CPU must be defined by board / board_common Makefile.features)
endif

# Set by default the CPU_MODEL as CPU
# TODO REVIEW IMPACT. It was before done by default in `cortexm.inc.mk`
CPU_MODEL ?= $(CPU)

include $(RIOTCPU)/$(CPU)/Makefile.features


Expand Down
3 changes: 0 additions & 3 deletions makefiles/arch/cortexm.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,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')
Expand Down

0 comments on commit e94b04c

Please sign in to comment.