From 413ffbb0356fdfdb8955a27c7716c393008d3444 Mon Sep 17 00:00:00 2001
From: Jose Alamos <jose.alamos@haw-hamburg.de>
Date: Thu, 5 Mar 2020 18:32:17 +0100
Subject: [PATCH 1/2] netdev: make netdev_% variants a submodule

---
 drivers/Makefile.dep                                          | 4 ++++
 drivers/{netdev_eth => netdev}/Makefile                       | 2 ++
 drivers/{netdev_ieee802154 => netdev}/Makefile.dep            | 0
 drivers/{netdev_eth/netdev_eth.c => netdev/eth.c}             | 0
 .../netdev_ieee802154.c => netdev/ieee802154.c}               | 0
 drivers/{netdev_layer/netdev_layer.c => netdev/layer.c}       | 0
 drivers/netdev_ieee802154/Makefile                            | 1 -
 drivers/netdev_layer/Makefile                                 | 1 -
 makefiles/pseudomodules.inc.mk                                | 3 +++
 9 files changed, 9 insertions(+), 2 deletions(-)
 rename drivers/{netdev_eth => netdev}/Makefile (66%)
 rename drivers/{netdev_ieee802154 => netdev}/Makefile.dep (100%)
 rename drivers/{netdev_eth/netdev_eth.c => netdev/eth.c} (100%)
 rename drivers/{netdev_ieee802154/netdev_ieee802154.c => netdev/ieee802154.c} (100%)
 rename drivers/{netdev_layer/netdev_layer.c => netdev/layer.c} (100%)
 delete mode 100644 drivers/netdev_ieee802154/Makefile
 delete mode 100644 drivers/netdev_layer/Makefile

diff --git a/drivers/Makefile.dep b/drivers/Makefile.dep
index 1ba5213fab..6c67043de5 100644
--- a/drivers/Makefile.dep
+++ b/drivers/Makefile.dep
@@ -140,3 +140,7 @@ endif
 ifneq (,$(filter ws281x_%,$(USEMODULE)))
   USEMODULE += ws281x
 endif
+
+ifneq (,$(filter netdev_%,$(USEMODULE)))
+  USEMODULE += netdev
+endif
diff --git a/drivers/netdev_eth/Makefile b/drivers/netdev/Makefile
similarity index 66%
rename from drivers/netdev_eth/Makefile
rename to drivers/netdev/Makefile
index 48422e909a..cd1af2456e 100644
--- a/drivers/netdev_eth/Makefile
+++ b/drivers/netdev/Makefile
@@ -1 +1,3 @@
+SUBMODULES := 1
+
 include $(RIOTBASE)/Makefile.base
diff --git a/drivers/netdev_ieee802154/Makefile.dep b/drivers/netdev/Makefile.dep
similarity index 100%
rename from drivers/netdev_ieee802154/Makefile.dep
rename to drivers/netdev/Makefile.dep
diff --git a/drivers/netdev_eth/netdev_eth.c b/drivers/netdev/eth.c
similarity index 100%
rename from drivers/netdev_eth/netdev_eth.c
rename to drivers/netdev/eth.c
diff --git a/drivers/netdev_ieee802154/netdev_ieee802154.c b/drivers/netdev/ieee802154.c
similarity index 100%
rename from drivers/netdev_ieee802154/netdev_ieee802154.c
rename to drivers/netdev/ieee802154.c
diff --git a/drivers/netdev_layer/netdev_layer.c b/drivers/netdev/layer.c
similarity index 100%
rename from drivers/netdev_layer/netdev_layer.c
rename to drivers/netdev/layer.c
diff --git a/drivers/netdev_ieee802154/Makefile b/drivers/netdev_ieee802154/Makefile
deleted file mode 100644
index 48422e909a..0000000000
--- a/drivers/netdev_ieee802154/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(RIOTBASE)/Makefile.base
diff --git a/drivers/netdev_layer/Makefile b/drivers/netdev_layer/Makefile
deleted file mode 100644
index 48422e909a..0000000000
--- a/drivers/netdev_layer/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(RIOTBASE)/Makefile.base
diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
index d3e9d84756..ddc9d2c9e6 100644
--- a/makefiles/pseudomodules.inc.mk
+++ b/makefiles/pseudomodules.inc.mk
@@ -75,6 +75,9 @@ PSEUDOMODULES += mpu_noexec_ram
 PSEUDOMODULES += nanocoap_%
 PSEUDOMODULES += netdev_default
 PSEUDOMODULES += netdev_ieee802154_%
+PSEUDOMODULES += netdev_ieee802154
+PSEUDOMODULES += netdev_eth
+PSEUDOMODULES += netdev_layer
 PSEUDOMODULES += netdev_register
 PSEUDOMODULES += netstats
 PSEUDOMODULES += netstats_l2

From 828961252937881ab4a91e763e38b92e6e344da5 Mon Sep 17 00:00:00 2001
From: Jose Alamos <jose.alamos@haw-hamburg.de>
Date: Wed, 30 Sep 2020 16:16:46 +0200
Subject: [PATCH 2/2] Makefile.dep: fix netdev_register resolution

---
 Makefile.dep         | 5 -----
 drivers/Makefile.dep | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile.dep b/Makefile.dep
index 5dece5690e..6b1c2ef220 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -69,11 +69,6 @@ ifneq (,$(filter gnrc_mac,$(USEMODULE)))
   endif
 endif
 
-# Don't register netdevs if there is only a single one  of them
-ifeq (,$(filter gnrc_netif_single,$(USEMODULE)))
-  USEMODULE += netdev_register
-endif
-
 ifneq (,$(filter gnrc_gomach,$(USEMODULE)))
   USEMODULE += gnrc_netif
   USEMODULE += gnrc_nettype_gomach
diff --git a/drivers/Makefile.dep b/drivers/Makefile.dep
index 6c67043de5..5000976fb3 100644
--- a/drivers/Makefile.dep
+++ b/drivers/Makefile.dep
@@ -143,4 +143,8 @@ endif
 
 ifneq (,$(filter netdev_%,$(USEMODULE)))
   USEMODULE += netdev
+  # Don't register netdevs if there is only a single one of them
+  ifeq (,$(filter gnrc_netif_single,$(USEMODULE)))
+    USEMODULE += netdev_register
+  endif
 endif