From ec6cd78174d9032bdeb62fb653febffb268cbb0d Mon Sep 17 00:00:00 2001 From: crasbe Date: Wed, 12 Mar 2025 15:39:38 +0100 Subject: [PATCH] boards/seeedstudio-xiao-nrf52840: use common Adafruit nRF52 bootloader --- boards/seeedstudio-xiao-nrf52840/Makefile | 5 +++++ boards/seeedstudio-xiao-nrf52840/Makefile.dep | 4 +++- boards/seeedstudio-xiao-nrf52840/Makefile.include | 5 ++++- boards/seeedstudio-xiao-nrf52840/reset.c | 1 - 4 files changed, 12 insertions(+), 3 deletions(-) mode change 120000 => 100644 boards/seeedstudio-xiao-nrf52840/Makefile.include delete mode 120000 boards/seeedstudio-xiao-nrf52840/reset.c diff --git a/boards/seeedstudio-xiao-nrf52840/Makefile b/boards/seeedstudio-xiao-nrf52840/Makefile index f8fcbb53a0..618366c50d 100644 --- a/boards/seeedstudio-xiao-nrf52840/Makefile +++ b/boards/seeedstudio-xiao-nrf52840/Makefile @@ -1,3 +1,8 @@ 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 index 08ee2d52af..9b1cdbaa2a 100644 --- a/boards/seeedstudio-xiao-nrf52840/Makefile.dep +++ b/boards/seeedstudio-xiao-nrf52840/Makefile.dep @@ -12,6 +12,8 @@ ifneq (,$(filter vfs_default,$(USEMODULE))) USEMODULE += mtd endif +# include common Adafruit nRF52 Bootloader dependencies +include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep + # include common nrf52 dependencies -include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/seeedstudio-xiao-nrf52840/Makefile.include b/boards/seeedstudio-xiao-nrf52840/Makefile.include deleted file mode 120000 index a2ad50e198..0000000000 --- a/boards/seeedstudio-xiao-nrf52840/Makefile.include +++ /dev/null @@ -1 +0,0 @@ -../feather-nrf52840/Makefile.include \ No newline at end of file diff --git a/boards/seeedstudio-xiao-nrf52840/Makefile.include b/boards/seeedstudio-xiao-nrf52840/Makefile.include new file mode 100644 index 0000000000..3544e3c7c5 --- /dev/null +++ b/boards/seeedstudio-xiao-nrf52840/Makefile.include @@ -0,0 +1,4 @@ +UF2_SOFTDEV ?= SD730 + +# Include the common definitions for the Adafruit nRF52 Bootloader +include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include diff --git a/boards/seeedstudio-xiao-nrf52840/reset.c b/boards/seeedstudio-xiao-nrf52840/reset.c deleted file mode 120000 index fe94c2c228..0000000000 --- a/boards/seeedstudio-xiao-nrf52840/reset.c +++ /dev/null @@ -1 +0,0 @@ -../feather-nrf52840/reset.c \ No newline at end of file