Skip to content

Commit ee3ebe1

Browse files
authored
Merge pull request #10078 from cladmi/pr/make/ensure_board_includes_cpu_features
boards: always include cpu features
2 parents 746d3e1 + b450141 commit ee3ebe1

File tree

116 files changed

+122
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+122
-115
lines changed

Makefile.include

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,13 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
246246
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
247247
include $(RIOTCPU)/$(CPU)/Makefile.include
248248

249+
# Sanity check
250+
# The check is only done after 'include $(RIOTBOARD)/$(BOARD)/Makefile.include'
251+
# because we need to have the 'CPU' variable defined
252+
ifeq (,$(filter $(RIOTCPU)/$(CPU)/Makefile.features,$(MAKEFILE_LIST)))
253+
$(error $$(RIOTCPU)/$$(CPU)/Makefile.features must have been included by the board / board common Makefile.features)
254+
endif
255+
249256
# Assume GCC/GNU as supported toolchain if CPU's Makefile.include doesn't
250257
# provide this macro
251258
TOOLCHAINS_SUPPORTED ?= gnu

boards/airfy-beacon/Makefile.features

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
1212
# The board MPU family (used for grouping by the CI system)
1313
FEATURES_MCU_GROUP = cortex_m0_2
1414

15-
-include $(RIOTCPU)/nrf51/Makefile.features
15+
include $(RIOTCPU)/nrf51/Makefile.features
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
22

3-
-include $(RIOTCPU)/atmega328p/Makefile.features
3+
include $(RIOTCPU)/atmega328p/Makefile.features
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
22

3-
-include $(RIOTCPU)/atmega2560/Makefile.features
3+
include $(RIOTCPU)/atmega2560/Makefile.features
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
22

3-
-include $(RIOTCPU)/samd21/Makefile.features
3+
include $(RIOTCPU)/samd21/Makefile.features
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
22

3-
-include $(RIOTCPU)/samd21/Makefile.features
3+
include $(RIOTCPU)/samd21/Makefile.features
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
22

3-
-include $(RIOTCPU)/samd21/Makefile.features
3+
include $(RIOTCPU)/samd21/Makefile.features
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
22

3-
-include $(RIOTCPU)/atmega328p/Makefile.features
3+
include $(RIOTCPU)/atmega328p/Makefile.features

boards/arduino-zero/Makefile.features

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ FEATURES_PROVIDED += arduino
1414
# The board MPU family (used for grouping by the CI system)
1515
FEATURES_MCU_GROUP = cortex_m0_2
1616

17-
-include $(RIOTCPU)/samd21/Makefile.features
17+
include $(RIOTCPU)/samd21/Makefile.features

boards/avsextrem/Makefile.features

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
1010
# The board MPU family (used for grouping by the CI system)
1111
FEATURES_MCU_GROUP = arm7
1212

13-
-include $(RIOTCPU)/lpc2387/Makefile.features
13+
include $(RIOTCPU)/lpc2387/Makefile.features

0 commit comments

Comments
 (0)