From a2308b65a2e50efff87639dbf6e81fde8a59bd8b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 1 Oct 2019 21:26:48 +0200 Subject: [PATCH] boards/nrf52: factorize even more dependencies --- boards/acd52832/Makefile.dep | 3 --- boards/common/nrf52/Makefile.dep | 8 +++++++- boards/common/particle-mesh/Makefile.dep | 4 +--- boards/nrf52832-mdk/Makefile.dep | 4 +--- boards/nrf52840-mdk/Makefile.dep | 4 +--- boards/nrf52840dk/Makefile.dep | 3 --- boards/nrf52dk/Makefile.dep | 3 --- boards/reel/Makefile.dep | 3 --- 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/boards/acd52832/Makefile.dep b/boards/acd52832/Makefile.dep index 89adaf38ad..68628f406a 100644 --- a/boards/acd52832/Makefile.dep +++ b/boards/acd52832/Makefile.dep @@ -1,4 +1 @@ include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep - -# include common nrf52832 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.dep diff --git a/boards/common/nrf52/Makefile.dep b/boards/common/nrf52/Makefile.dep index 55dfa6f717..7983ffd731 100644 --- a/boards/common/nrf52/Makefile.dep +++ b/boards/common/nrf52/Makefile.dep @@ -2,4 +2,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_nrf_temperature endif -include $(RIOTCPU)/nrf52/Makefile.dep +ifneq (,$(findstring nrf52832, $(CPU_MODEL))) + # include common nrf52832 dependencies + include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.dep +else ifneq (,$(findstring nrf52840, $(CPU_MODEL))) + # include common nrf52840 dependencies + include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep +endif diff --git a/boards/common/particle-mesh/Makefile.dep b/boards/common/particle-mesh/Makefile.dep index 1a53048ead..b68127eea4 100644 --- a/boards/common/particle-mesh/Makefile.dep +++ b/boards/common/particle-mesh/Makefile.dep @@ -2,7 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -# include common nrf52840 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep - +# include common nrf52 dependencies include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/nrf52832-mdk/Makefile.dep b/boards/nrf52832-mdk/Makefile.dep index a847d952c1..b68127eea4 100644 --- a/boards/nrf52832-mdk/Makefile.dep +++ b/boards/nrf52832-mdk/Makefile.dep @@ -2,7 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -# include common nrf52832 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.dep - +# include common nrf52 dependencies include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/nrf52840-mdk/Makefile.dep b/boards/nrf52840-mdk/Makefile.dep index 1a53048ead..b68127eea4 100644 --- a/boards/nrf52840-mdk/Makefile.dep +++ b/boards/nrf52840-mdk/Makefile.dep @@ -2,7 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -# include common nrf52840 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep - +# include common nrf52 dependencies include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/nrf52840dk/Makefile.dep b/boards/nrf52840dk/Makefile.dep index 9f10cd4c21..68628f406a 100644 --- a/boards/nrf52840dk/Makefile.dep +++ b/boards/nrf52840dk/Makefile.dep @@ -1,4 +1 @@ -# include common nrf52840 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep - include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep diff --git a/boards/nrf52dk/Makefile.dep b/boards/nrf52dk/Makefile.dep index 436ebd82b2..68628f406a 100644 --- a/boards/nrf52dk/Makefile.dep +++ b/boards/nrf52dk/Makefile.dep @@ -1,4 +1 @@ -# include common nrf52832 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.dep - include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep diff --git a/boards/reel/Makefile.dep b/boards/reel/Makefile.dep index 9d98a85b7e..7785606542 100644 --- a/boards/reel/Makefile.dep +++ b/boards/reel/Makefile.dep @@ -3,7 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += mma8x5x endif -# include common nrf52840 dependencies -include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep - include $(RIOTBOARD)/common/nrf52/Makefile.dep