Skip to content

Commit

Permalink
boards/common/nrf52: move CPU/CPU_MODEL definiton to Makefile.features
Browse files Browse the repository at this point in the history
cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are
automatically included

Part of moving CPU/CPU_MODEL definition to Makefile.features to have it
available before Makefile.include.
  • Loading branch information
cladmi committed Sep 24, 2019
1 parent 49d61bb commit 5f1a61e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 0 additions & 2 deletions boards/common/nrf52/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include $(RIOTCPU)/nrf52/Makefile.dep

ifneq (,$(filter skald,$(USEMODULE)))
USEMODULE += nrfble
endif
Expand Down
4 changes: 2 additions & 2 deletions boards/common/nrf52/Makefile.features
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CPU = nrf52

# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_rtt
FEATURES_PROVIDED += periph_timer
Expand All @@ -8,5 +10,3 @@ endif
# Various other features (if any)
FEATURES_PROVIDED += ble_nimble
FEATURES_PROVIDED += radio_nrfble

include $(RIOTCPU)/nrf52/Makefile.features
3 changes: 0 additions & 3 deletions boards/common/nrf52/Makefile.include
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# this module contains shared code for all boards using the nrf52 CPU
export CPU = nrf52

# include this module into the build
INCLUDES += -I$(RIOTBOARD)/common/nrf52/include

Expand Down

0 comments on commit 5f1a61e

Please sign in to comment.