sys/riotboot: move dependency resolution in its own Makefile.dep

hugueslarrive · Jun 15, 2023 · d617d86 · d617d86
1 parent 1f4adb2
commit d617d86
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/sys/Makefile.dep b/sys/Makefile.dep
@@ -680,42 +680,8 @@ ifneq (,$(filter usbus_msc,$(USEMODULE)))
   USEMODULE += mtd_write_page
 endif
 
-ifneq (,$(filter riotboot_flashwrite, $(USEMODULE)))
-  USEMODULE += riotboot_slot
-  FEATURES_REQUIRED += periph_flashpage
-endif
-
-ifneq (,$(filter riotboot_slot, $(USEMODULE)))
-  USEMODULE += riotboot_hdr
-endif
-
-ifneq (,$(filter riotboot_serial, $(USEMODULE)))
-  FEATURES_REQUIRED += periph_flashpage
-  FEATURES_REQUIRED += periph_uart
-  USEMODULE += riotboot_reset
-  USEMODULE += checksum
-endif
-
-ifneq (,$(filter riotboot_reset, $(USEMODULE)))
+ifneq (,$(filter riotboot_%, $(USEMODULE)))
   USEMODULE += riotboot
-  USEMODULE += usb_board_reset
-endif
-
-ifneq (,$(filter riotboot_hdr, $(USEMODULE)))
-  USEMODULE += checksum
-  USEMODULE += riotboot
-endif
-
-ifneq (,$(filter riotboot_usb_dfu, $(USEMODULE)))
-  USEMODULE += usbus_dfu
-  USEMODULE += riotboot_flashwrite
-  USEMODULE += ztimer_sec
-  FEATURES_REQUIRED += no_idle_thread
-  FEATURES_REQUIRED += periph_pm
-endif
-
-ifneq (,$(filter riotboot_tinyusb_dfu, $(USEMODULE)))
-  USEPKG += tinyusb
 endif
 
 ifneq (,$(filter irq_handler,$(USEMODULE)))

diff --git a/sys/riotboot/Makefile.dep b/sys/riotboot/Makefile.dep
@@ -0,0 +1,35 @@
+ifneq (,$(filter riotboot_flashwrite, $(USEMODULE)))
+  USEMODULE += riotboot_slot
+  FEATURES_REQUIRED += periph_flashpage
+endif
+
+ifneq (,$(filter riotboot_slot, $(USEMODULE)))
+  USEMODULE += riotboot_hdr
+endif
+
+ifneq (,$(filter riotboot_serial, $(USEMODULE)))
+  FEATURES_REQUIRED += periph_flashpage
+  FEATURES_REQUIRED += periph_uart
+  USEMODULE += riotboot_reset
+  USEMODULE += checksum
+endif
+
+ifneq (,$(filter riotboot_reset, $(USEMODULE)))
+  USEMODULE += usb_board_reset
+endif
+
+ifneq (,$(filter riotboot_hdr, $(USEMODULE)))
+  USEMODULE += checksum
+endif
+
+ifneq (,$(filter riotboot_usb_dfu, $(USEMODULE)))
+  USEMODULE += usbus_dfu
+  USEMODULE += riotboot_flashwrite
+  USEMODULE += ztimer_sec
+  FEATURES_REQUIRED += no_idle_thread
+  FEATURES_REQUIRED += periph_pm
+endif
+
+ifneq (,$(filter riotboot_tinyusb_dfu, $(USEMODULE)))
+  USEPKG += tinyusb
+endif