From c9de733c526b6a458da3c18f1d3912ac0e4ce1d9 Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Wed, 29 Sep 2021 10:16:31 +0200
Subject: [PATCH] cpu/nrf52/Makefile.dep: move radio dependencies from
 boards/common

---
 boards/common/nrf52/Makefile.dep                    | 8 --------
 boards/e104-bt5010a-tb/Makefile.dep                 | 7 ++++++-
 cpu/nrf52/Makefile.dep                              | 8 ++++++++
 {boards/common => cpu}/nrf52/Makefile.nimble.dep    | 0
 {boards/common => cpu}/nrf52/Makefile.nrf802154.dep | 0
 {boards/common => cpu}/nrf52/Makefile.nrfmin.dep    | 0
 6 files changed, 14 insertions(+), 9 deletions(-)
 rename {boards/common => cpu}/nrf52/Makefile.nimble.dep (100%)
 rename {boards/common => cpu}/nrf52/Makefile.nrf802154.dep (100%)
 rename {boards/common => cpu}/nrf52/Makefile.nrfmin.dep (100%)

diff --git a/boards/common/nrf52/Makefile.dep b/boards/common/nrf52/Makefile.dep
index 9a45e5e814..dd17f3762c 100644
--- a/boards/common/nrf52/Makefile.dep
+++ b/boards/common/nrf52/Makefile.dep
@@ -1,11 +1,3 @@
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_nrf_temperature
 endif
-
-ifneq (,$(filter nrf52811xxaa nrf52820xxaa nrf52833xxaa nrf52840xxaa,$(CPU_MODEL)))
-  # include dependencies for 802.15.4 radio
-  include $(RIOTBOARD)/common/nrf52/Makefile.nrf802154.dep
-else
-  # include dependencies for BLE
-  include $(RIOTBOARD)/common/nrf52/Makefile.nimble.dep
-endif
diff --git a/boards/e104-bt5010a-tb/Makefile.dep b/boards/e104-bt5010a-tb/Makefile.dep
index 45f77b84c5..1c7262ec32 100644
--- a/boards/e104-bt5010a-tb/Makefile.dep
+++ b/boards/e104-bt5010a-tb/Makefile.dep
@@ -1,5 +1,10 @@
 USEMODULE += boards_common_e104_bt50xxa_tb
 
 # use nrfmin for GNRC as nimble is too large for the board
-include $(RIOTBOARD)/common/nrf52/Makefile.nrfmin.dep
+ifneq (,$(filter netdev_default,$(USEMODULE)))
+  ifeq (,$(filter nimble_% nrf802154,$(USEMODULE)))
+    USEMODULE += nrfmin
+  endif
+endif
+
 include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.dep
diff --git a/cpu/nrf52/Makefile.dep b/cpu/nrf52/Makefile.dep
index 7b32021f35..2e72e5da33 100644
--- a/cpu/nrf52/Makefile.dep
+++ b/cpu/nrf52/Makefile.dep
@@ -1,5 +1,13 @@
 USEMODULE += nrf52_vectors
 
+ifneq (,$(filter nrf52811xxaa nrf52820xxaa nrf52833xxaa nrf52840xxaa,$(CPU_MODEL)))
+  # include dependencies for 802.15.4 radio
+  include $(RIOTCPU)/nrf52/Makefile.nrf802154.dep
+else
+  # include dependencies for BLE
+  include $(RIOTCPU)/nrf52/Makefile.nimble.dep
+endif
+
 ifneq (,$(filter nrf802154,$(USEMODULE)))
   FEATURES_REQUIRED += periph_timer
   FEATURES_REQUIRED += radio_nrf802154
diff --git a/boards/common/nrf52/Makefile.nimble.dep b/cpu/nrf52/Makefile.nimble.dep
similarity index 100%
rename from boards/common/nrf52/Makefile.nimble.dep
rename to cpu/nrf52/Makefile.nimble.dep
diff --git a/boards/common/nrf52/Makefile.nrf802154.dep b/cpu/nrf52/Makefile.nrf802154.dep
similarity index 100%
rename from boards/common/nrf52/Makefile.nrf802154.dep
rename to cpu/nrf52/Makefile.nrf802154.dep
diff --git a/boards/common/nrf52/Makefile.nrfmin.dep b/cpu/nrf52/Makefile.nrfmin.dep
similarity index 100%
rename from boards/common/nrf52/Makefile.nrfmin.dep
rename to cpu/nrf52/Makefile.nrfmin.dep