From 66d903c209fe7bff1b833f2d8cb31e2068671ad8 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sat, 7 Dec 2019 16:53:23 +0100 Subject: [PATCH] cpu/nrf5x: move dependencies to Makefile.dep --- cpu/nrf51/Makefile.dep | 1 + cpu/nrf52/Makefile.dep | 2 ++ cpu/nrf5x_common/Makefile.dep | 5 +++++ cpu/nrf5x_common/Makefile.include | 6 ------ 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 cpu/nrf51/Makefile.dep create mode 100644 cpu/nrf5x_common/Makefile.dep diff --git a/cpu/nrf51/Makefile.dep b/cpu/nrf51/Makefile.dep new file mode 100644 index 0000000000..56c2263f7e --- /dev/null +++ b/cpu/nrf51/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTCPU)/nrf5x_common/Makefile.dep diff --git a/cpu/nrf52/Makefile.dep b/cpu/nrf52/Makefile.dep index d5e4d42993..cbf9f0708b 100644 --- a/cpu/nrf52/Makefile.dep +++ b/cpu/nrf52/Makefile.dep @@ -4,3 +4,5 @@ ifneq (,$(filter nrf802154,$(USEMODULE))) USEMODULE += luid USEMODULE += netdev_ieee802154 endif + +include $(RIOTCPU)/nrf5x_common/Makefile.dep diff --git a/cpu/nrf5x_common/Makefile.dep b/cpu/nrf5x_common/Makefile.dep new file mode 100644 index 0000000000..ae1319e836 --- /dev/null +++ b/cpu/nrf5x_common/Makefile.dep @@ -0,0 +1,5 @@ +# include nrf5x common periph drivers +USEMODULE += nrf5x_common_periph + +# link common cpu code +USEMODULE += cpu_common diff --git a/cpu/nrf5x_common/Makefile.include b/cpu/nrf5x_common/Makefile.include index 9dc47f49b0..c4b3dec388 100644 --- a/cpu/nrf5x_common/Makefile.include +++ b/cpu/nrf5x_common/Makefile.include @@ -1,9 +1,3 @@ CFLAGS += -DCPU_FAM_$(call uppercase_and_underscore,$(CPU_FAM)) -# include nrf5x common periph drivers -USEMODULE += nrf5x_common_periph - -# link common cpu code -USEMODULE += cpu_common - INCLUDES += -I$(RIOTCPU)/nrf5x_common/include