boards: adapt boards with ada-nrf52-bl to common makefiles

crasbe · crasbe · commit df30029bdda7 · 2025-03-26T11:50:27.000+01:00
diff --git a/boards/Makefile b/boards/Makefile
@@ -3,5 +3,8 @@ DIRS += $(RIOTBOARD)/common/init
 
 
 # SORT THIS ALPHABETICALLY BY BOARD NAME!
+ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
+  DIRS += $(RIOTBOARD)/common/adafruit-nrf52-bootloader
+endif
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/Makefile.dep b/boards/Makefile.dep
@@ -1 +1,4 @@
 # SORT THIS ALPHABETICALLY BY BOARD NAME!
+ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
+  include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep
+endif
diff --git a/boards/Makefile.include b/boards/Makefile.include
@@ -1 +1,4 @@
 # SORT THIS ALPHABETICALLY BY BOARD NAME!
+ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
+  include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include
+endif
diff --git a/boards/common/adafruit-nrf52-bootloader/Makefile.dep b/boards/common/adafruit-nrf52-bootloader/Makefile.dep
@@ -1,4 +1 @@
 include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk
-
-# make sure the bootloader module is used for reset to work
-USEMODULE += boards_common_adafruit-nrf52-bootloader
diff --git a/boards/feather-nrf52840-sense/Makefile b/boards/feather-nrf52840-sense/Makefile
@@ -1,8 +1,3 @@
 MODULE = board
 
-ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
-  # add the adafruit-nrf52-bootloader directory to the build
-  DIRS += $(RIOTBOARD)/common/adafruit-nrf52-bootloader
-endif
-
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/feather-nrf52840-sense/Makefile.dep b/boards/feather-nrf52840-sense/Makefile.dep
@@ -9,8 +9,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += ws281x
 endif
 
-# include common Adafruit nRF52 Bootloader dependencies
-include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep
+USEMODULE += boards_common_adafruit-nrf52-bootloader
 
 # include common nrf52 dependencies
 include $(RIOTBOARD)/common/nrf52/Makefile.dep
diff --git a/boards/feather-nrf52840-sense/Makefile.include b/boards/feather-nrf52840-sense/Makefile.include
@@ -1,4 +1 @@
 UF2_SOFTDEV ?= SD611
-
-# Include the common definitions for the Adafruit nRF52 Bootloader
-include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include
diff --git a/boards/feather-nrf52840/Makefile b/boards/feather-nrf52840/Makefile
@@ -1,8 +1,3 @@
 MODULE = board
 
-ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
-  # add the adafruit-nrf52-bootloader directory to the build
-  DIRS += $(RIOTBOARD)/common/adafruit-nrf52-bootloader
-endif
-
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/feather-nrf52840/Makefile.dep b/boards/feather-nrf52840/Makefile.dep
@@ -4,8 +4,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += ws281x
 endif
 
-# include common Adafruit nRF52 Bootloader dependencies
-include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep
+USEMODULE += boards_common_adafruit-nrf52-bootloader
 
 # include common nrf52 dependencies
 include $(RIOTBOARD)/common/nrf52/Makefile.dep
diff --git a/boards/feather-nrf52840/Makefile.include b/boards/feather-nrf52840/Makefile.include
@@ -1,4 +1 @@
 UF2_SOFTDEV ?= SD611
-
-# Include the common definitions for the Adafruit nRF52 Bootloader
-include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include
diff --git a/boards/seeedstudio-xiao-nrf52840/Makefile b/boards/seeedstudio-xiao-nrf52840/Makefile
@@ -1,8 +1,3 @@
 MODULE = board
 
-ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
-  # add the adafruit-nrf52-bootloader directory to the build
-  DIRS += $(RIOTBOARD)/common/adafruit-nrf52-bootloader
-endif
-
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/seeedstudio-xiao-nrf52840/Makefile.dep b/boards/seeedstudio-xiao-nrf52840/Makefile.dep
@@ -12,8 +12,7 @@ ifneq (,$(filter vfs_default,$(USEMODULE)))
   USEMODULE += mtd
 endif
 
-# include common Adafruit nRF52 Bootloader dependencies
-include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep
+USEMODULE += boards_common_adafruit-nrf52-bootloader
 
 # include common nrf52 dependencies
 include $(RIOTBOARD)/common/nrf52/Makefile.dep
diff --git a/boards/seeedstudio-xiao-nrf52840/Makefile.include b/boards/seeedstudio-xiao-nrf52840/Makefile.include
@@ -1,4 +1 @@
 UF2_SOFTDEV ?= SD730
-
-# Include the common definitions for the Adafruit nRF52 Bootloader
-include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include
