make: allow drivers to implement features

This change allows drivers (or any module for that matter) to provide features. This is e.g. useful if a board does not have a transceiver, but your application uses `USEMODULE += some_driver`, which implements the transceiver interface. The line `FEATURES_PROVIDED += some_feature` should go to the guarded block in `{sys,drivers}/Makefile.include`.
8 years ago · 765c88d08a
26 changed files with 31 additions and 29 deletions
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@ -173,7 +173,7 @@ info-build:
 	@echo '         $(or $(sort $(filter-out $(FEATURES_OPTIONAL), $(FEATURES_REQUIRED))), -none-)'
 	@echo 'FEATURES_OPTIONAL (strictly "nice to have"):'
 	@echo '         $(or $(sort $(FEATURES_OPTIONAL)), -none-)'
-	@echo 'FEATURES_PROVIDED (by the board):'
+	@echo 'FEATURES_PROVIDED (by the board or USEMODULE'"'"'d drivers):'
 	@echo '         $(or $(sort $(FEATURES_PROVIDED)), -none-)'
 	@echo 'FEATURES_MISSING (incl. optional features):'
 	@echo '         $(or $(sort $(filter-out $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))), -none-)'
@ -229,7 +229,7 @@ ifneq (, $(filter info-boards-supported info-boards-features-missing info-build,
  FEATURES_PROVIDED_BAK := $(FEATURES_PROVIDED)

  define board_missing_features
-    FEATURES_PROVIDED :=
+    FEATURES_PROVIDED := $(FEATURES_PROVIDED_BAK)
    -include $${RIOTBOARD}/${1}/Makefile.features

    FEATURES_MISSING := $$(filter-out $$(FEATURES_PROVIDED), $$(FEATURES_REQUIRED))
--- a/Makefile.include
+++ b/Makefile.include
@ -77,9 +77,6 @@ ifeq ($(strip $(MCU)),)
 	MCU = $(CPU)
 endif

-# import list of provided features
-include $(RIOTBOARD)/$(BOARD)/Makefile.features
-
 # if you want to publish the board into the sources as an uppercase #define
 BOARDDEF := $(shell echo $(BOARD) | tr 'a-z' 'A-Z' | tr '-' '_')
 CPUDEF := $(shell echo $(CPU) | tr 'a-z' 'A-Z' | tr '-' '_')
@ -205,10 +202,15 @@ objdump:
 # Extra make goals for testing and comparing changes.
 include $(RIOTBASE)/Makefile.buildtests

+# import list of provided features
+-include $(RIOTBOARD)/$(BOARD)/Makefile.features
+
 # Export variables used throughout the whole make system:
 include $(RIOTBASE)/Makefile.vars

+# Warn if the selected board and drivers don't provide all needed featues:
 ifneq (, $(filter all, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all)))
+
  EXPECT_ERRORS :=

  # Test if there where dependencies against a module in DISABLE_MODULE.
--- a/boards/arduino-due/Makefile.features
+++ b/boards/arduino-due/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_spi periph_random
+FEATURES_PROVIDED += periph_gpio periph_spi periph_random
--- a/boards/arduino-mega2560/Makefile.features
+++ b/boards/arduino-mega2560/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED =
+FEATURES_PROVIDED +=
--- a/boards/avsextrem/Makefile.features
+++ b/boards/avsextrem/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver
--- a/boards/cc2538dk/Makefile.features
+++ b/boards/cc2538dk/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_cpuid
+FEATURES_PROVIDED += periph_gpio periph_random periph_cpuid
--- a/boards/iot-lab_M3/Makefile.features
+++ b/boards/iot-lab_M3/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver periph_gpio periph_uart periph_spi periph_i2c periph_rtt
+FEATURES_PROVIDED += transceiver periph_gpio periph_uart periph_spi periph_i2c periph_rtt
--- a/boards/msb-430h/Makefile.features
+++ b/boards/msb-430h/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver
--- a/boards/msba2/Makefile.features
+++ b/boards/msba2/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver periph_pwm
+FEATURES_PROVIDED += transceiver periph_pwm
--- a/boards/msbiot/Makefile.features
+++ b/boards/msbiot/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio
+FEATURES_PROVIDED += periph_gpio
--- a/boards/native/Makefile.features
+++ b/boards/native/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver periph_cpuid
+FEATURES_PROVIDED += transceiver periph_cpuid
--- a/boards/openmote/Makefile.features
+++ b/boards/openmote/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_cpuid
+FEATURES_PROVIDED += periph_gpio periph_random periph_cpuid
--- a/boards/pca10000/Makefile.features
+++ b/boards/pca10000/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_rtt periph_cpuid
+FEATURES_PROVIDED += periph_gpio periph_random periph_rtt periph_cpuid
--- a/boards/pca10005/Makefile.features
+++ b/boards/pca10005/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_rtt periph_cpuid
+FEATURES_PROVIDED += periph_gpio periph_random periph_rtt periph_cpuid
--- a/boards/pttu/Makefile.features
+++ b/boards/pttu/Makefile.features
@ -1,2 +1,2 @@
 # Enable this after fixing https://github.com/RIOT-OS/RIOT/issues/659
-#FEATURES_PROVIDED = transceiver
+#FEATURES_PROVIDED += transceiver
--- a/boards/redbee-econotag/Makefile.features
+++ b/boards/redbee-econotag/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver
--- a/boards/samr21-xpro/Makefile.features
+++ b/boards/samr21-xpro/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio
+FEATURES_PROVIDED += periph_gpio
--- a/boards/stm32f0discovery/Makefile.features
+++ b/boards/stm32f0discovery/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_spi
+FEATURES_PROVIDED += periph_gpio periph_spi
--- a/boards/stm32f3discovery/Makefile.features
+++ b/boards/stm32f3discovery/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio
+FEATURES_PROVIDED += periph_gpio
--- a/boards/stm32f4discovery/Makefile.features
+++ b/boards/stm32f4discovery/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_spi periph_pwm periph_random
+FEATURES_PROVIDED += periph_gpio periph_spi periph_pwm periph_random
--- a/boards/telosb/Makefile.features
+++ b/boards/telosb/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver
--- a/boards/udoo/Makefile.features
+++ b/boards/udoo/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio
+FEATURES_PROVIDED += periph_gpio
--- a/boards/wsn430-v1_3b/Makefile.features
+++ b/boards/wsn430-v1_3b/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver
--- a/boards/wsn430-v1_4/Makefile.features
+++ b/boards/wsn430-v1_4/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver
--- a/boards/yunjia-nrf51822/Makefile.features
+++ b/boards/yunjia-nrf51822/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_rtt periph_cpuid
+FEATURES_PROVIDED += periph_gpio periph_random periph_rtt periph_cpuid
--- a/boards/z1/Makefile.features
+++ b/boards/z1/Makefile.features
@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED += transceiver