From 8965e9e26c3030ce6d425b6650d63a148a49e2a6 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Sat, 9 Sep 2017 15:28:01 +0200
Subject: [PATCH] make: make features available to Makefile.include

---
 Makefile.include          | 6 +++---
 makefiles/features.inc.mk | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 makefiles/features.inc.mk

diff --git a/Makefile.include b/Makefile.include
index baa985eb16..b2c2125883 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -207,6 +207,9 @@ INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBAS
 INCLUDES += -I$(RIOTCPU)/$(CPU)/include
 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
 
+# process provided features
+-include $(RIOTBOARD)/$(BOARD)/Makefile.features
+
 # mandatory includes!
 include $(RIOTMAKE)/pseudomodules.inc.mk
 include $(RIOTMAKE)/defaultmodules.inc.mk
@@ -223,9 +226,6 @@ ifneq ($(GNRC_NETIF_NUMOF),1)
   CFLAGS += -DGNRC_NETIF_NUMOF=$(GNRC_NETIF_NUMOF)
 endif
 
-# process provided features
-include $(RIOTMAKE)/features.inc.mk
-
 # process dependencies
 include $(RIOTBASE)/Makefile.dep
 
diff --git a/makefiles/features.inc.mk b/makefiles/features.inc.mk
deleted file mode 100644
index e74cc78662..0000000000
--- a/makefiles/features.inc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# import list of provided features
-include $(RIOTBOARD)/$(BOARD)/Makefile.features
-
-DEFAULT_FEATURES += periph_pm
-
-# add available default features to required list
-FEATURES_REQUIRED += $(filter-out $(DISABLE_FEATURES), $(filter $(FEATURES_PROVIDED), $(DEFAULT_FEATURES)))
-- 
GitLab