diff --git a/boards/adafruit-itsybitsy-m4/Makefile b/boards/adafruit-itsybitsy-m4/Makefile index 1e353261c5..c05443c508 100644 --- a/boards/adafruit-itsybitsy-m4/Makefile +++ b/boards/adafruit-itsybitsy-m4/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/samd21-arduino-bootloader +DIRS = $(RIOTBOARD)/common/samdx1-arduino-bootloader include $(RIOTBASE)/Makefile.base diff --git a/boards/adafruit-itsybitsy-m4/Makefile.dep b/boards/adafruit-itsybitsy-m4/Makefile.dep index f4ab072375..87253c2f37 100644 --- a/boards/adafruit-itsybitsy-m4/Makefile.dep +++ b/boards/adafruit-itsybitsy-m4/Makefile.dep @@ -8,4 +8,4 @@ ifneq (,$(filter mtd,$(USEMODULE))) endif # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/adafruit-itsybitsy-m4/Makefile.include b/boards/adafruit-itsybitsy-m4/Makefile.include index df391bd5f5..d9b879af10 100644 --- a/boards/adafruit-itsybitsy-m4/Makefile.include +++ b/boards/adafruit-itsybitsy-m4/Makefile.include @@ -1,6 +1,6 @@ CFLAGS += -DBOOTLOADER_UF2 # Include all definitions for flashing with bossa other USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include # Include handling of serial and non-bossa programmers (if selected by user) include $(RIOTMAKE)/boards/sam0.inc.mk diff --git a/boards/arduino-nano-33-iot/Makefile b/boards/arduino-nano-33-iot/Makefile index 1e353261c5..c05443c508 100644 --- a/boards/arduino-nano-33-iot/Makefile +++ b/boards/arduino-nano-33-iot/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/samd21-arduino-bootloader +DIRS = $(RIOTBOARD)/common/samdx1-arduino-bootloader include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-nano-33-iot/Makefile.dep b/boards/arduino-nano-33-iot/Makefile.dep index c15f2eaf26..716e2eadfb 100644 --- a/boards/arduino-nano-33-iot/Makefile.dep +++ b/boards/arduino-nano-33-iot/Makefile.dep @@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/arduino-nano-33-iot/Makefile.include b/boards/arduino-nano-33-iot/Makefile.include index df8bec56c1..f2fde797ba 100644 --- a/boards/arduino-nano-33-iot/Makefile.include +++ b/boards/arduino-nano-33-iot/Makefile.include @@ -2,7 +2,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # Include all definitions for flashing with bossa over USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include # Include handling of serial and non-bossa programmers (if selected by user) include $(RIOTMAKE)/boards/sam0.inc.mk diff --git a/boards/common/arduino-mkr/Makefile b/boards/common/arduino-mkr/Makefile index b4202bae82..1a3293d50e 100644 --- a/boards/common/arduino-mkr/Makefile +++ b/boards/common/arduino-mkr/Makefile @@ -1,8 +1,8 @@ MODULE = boards_common_arduino-mkr -ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE))) - # Add the samd21-arduino-bootloader directory to the build - DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE))) + # Add the samdx1-arduino-bootloader directory to the build + DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader endif include $(RIOTBASE)/Makefile.base diff --git a/boards/common/arduino-mkr/Makefile.dep b/boards/common/arduino-mkr/Makefile.dep index c15f2eaf26..716e2eadfb 100644 --- a/boards/common/arduino-mkr/Makefile.dep +++ b/boards/common/arduino-mkr/Makefile.dep @@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/common/arduino-mkr/Makefile.include b/boards/common/arduino-mkr/Makefile.include index 68760aa9b7..1b43a45cc8 100644 --- a/boards/common/arduino-mkr/Makefile.include +++ b/boards/common/arduino-mkr/Makefile.include @@ -5,6 +5,6 @@ ifeq ($(PROGRAMMER),jlink) endif # Include all definitions for flashing with bossa over USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include INCLUDES += -I$(RIOTBOARD)/common/arduino-mkr/include diff --git a/boards/common/samd21-arduino-bootloader/Makefile b/boards/common/samd21-arduino-bootloader/Makefile deleted file mode 100644 index 7b62d52544..0000000000 --- a/boards/common/samd21-arduino-bootloader/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = boards_common_samd21-arduino-bootloader - -include $(RIOTBASE)/Makefile.base diff --git a/boards/common/samdx1-arduino-bootloader/Makefile b/boards/common/samdx1-arduino-bootloader/Makefile new file mode 100644 index 0000000000..b1373a0698 --- /dev/null +++ b/boards/common/samdx1-arduino-bootloader/Makefile @@ -0,0 +1,3 @@ +MODULE = boards_common_samdx1-arduino-bootloader + +include $(RIOTBASE)/Makefile.base diff --git a/boards/common/samd21-arduino-bootloader/Makefile.dep b/boards/common/samdx1-arduino-bootloader/Makefile.dep similarity index 77% rename from boards/common/samd21-arduino-bootloader/Makefile.dep rename to boards/common/samdx1-arduino-bootloader/Makefile.dep index a735fc652b..dea815ad7b 100644 --- a/boards/common/samd21-arduino-bootloader/Makefile.dep +++ b/boards/common/samdx1-arduino-bootloader/Makefile.dep @@ -2,6 +2,6 @@ include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk # USB Board reset only works if CDC ACM is used ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) - USEMODULE += boards_common_samd21-arduino-bootloader + USEMODULE += boards_common_samdx1-arduino-bootloader USEMODULE += usb_board_reset endif diff --git a/boards/common/samd21-arduino-bootloader/Makefile.include b/boards/common/samdx1-arduino-bootloader/Makefile.include similarity index 100% rename from boards/common/samd21-arduino-bootloader/Makefile.include rename to boards/common/samdx1-arduino-bootloader/Makefile.include diff --git a/boards/common/samd21-arduino-bootloader/reset.c b/boards/common/samdx1-arduino-bootloader/reset.c similarity index 100% rename from boards/common/samd21-arduino-bootloader/reset.c rename to boards/common/samdx1-arduino-bootloader/reset.c diff --git a/boards/common/sodaq/Makefile b/boards/common/sodaq/Makefile index 8d1038131b..6cd5b19b15 100644 --- a/boards/common/sodaq/Makefile +++ b/boards/common/sodaq/Makefile @@ -1,8 +1,8 @@ MODULE = boards_common_sodaq -ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE))) - # Add the samd21-arduino-bootloader directory to the build - DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE))) + # Add the samdx1-arduino-bootloader directory to the build + DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader endif include $(RIOTBASE)/Makefile.base diff --git a/boards/common/sodaq/Makefile.dep b/boards/common/sodaq/Makefile.dep index c15f2eaf26..716e2eadfb 100644 --- a/boards/common/sodaq/Makefile.dep +++ b/boards/common/sodaq/Makefile.dep @@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/common/sodaq/Makefile.include b/boards/common/sodaq/Makefile.include index 95dcecc8eb..23344513b3 100644 --- a/boards/common/sodaq/Makefile.include +++ b/boards/common/sodaq/Makefile.include @@ -2,4 +2,4 @@ INCLUDES += -I$(RIOTBOARD)/common/sodaq/include # Include all definitions for flashing with bossa over USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include diff --git a/boards/feather-m0/Makefile b/boards/feather-m0/Makefile index c43a63297c..106a134b41 100644 --- a/boards/feather-m0/Makefile +++ b/boards/feather-m0/Makefile @@ -1,8 +1,8 @@ MODULE = board -ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE))) - # Add the samd21-arduino-bootloader directory to the build - DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE))) + # Add the samdx1-arduino-bootloader directory to the build + DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader endif include $(RIOTBASE)/Makefile.base diff --git a/boards/feather-m0/Makefile.dep b/boards/feather-m0/Makefile.dep index c15f2eaf26..716e2eadfb 100644 --- a/boards/feather-m0/Makefile.dep +++ b/boards/feather-m0/Makefile.dep @@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/feather-m0/Makefile.include b/boards/feather-m0/Makefile.include index 0576a83330..df048f40b4 100644 --- a/boards/feather-m0/Makefile.include +++ b/boards/feather-m0/Makefile.include @@ -5,4 +5,4 @@ ifeq ($(PROGRAMMER),jlink) endif # Include all definitions for flashing with bossa over USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include diff --git a/boards/serpente/Makefile b/boards/serpente/Makefile index 1e353261c5..c05443c508 100644 --- a/boards/serpente/Makefile +++ b/boards/serpente/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/samd21-arduino-bootloader +DIRS = $(RIOTBOARD)/common/samdx1-arduino-bootloader include $(RIOTBASE)/Makefile.base diff --git a/boards/serpente/Makefile.dep b/boards/serpente/Makefile.dep index 9a846d2395..f7d95020cb 100644 --- a/boards/serpente/Makefile.dep +++ b/boards/serpente/Makefile.dep @@ -7,4 +7,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/serpente/Makefile.include b/boards/serpente/Makefile.include index df391bd5f5..d9b879af10 100644 --- a/boards/serpente/Makefile.include +++ b/boards/serpente/Makefile.include @@ -1,6 +1,6 @@ CFLAGS += -DBOOTLOADER_UF2 # Include all definitions for flashing with bossa other USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include # Include handling of serial and non-bossa programmers (if selected by user) include $(RIOTMAKE)/boards/sam0.inc.mk diff --git a/boards/sodaq-one/Makefile b/boards/sodaq-one/Makefile index c43a63297c..106a134b41 100644 --- a/boards/sodaq-one/Makefile +++ b/boards/sodaq-one/Makefile @@ -1,8 +1,8 @@ MODULE = board -ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE))) - # Add the samd21-arduino-bootloader directory to the build - DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE))) + # Add the samdx1-arduino-bootloader directory to the build + DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader endif include $(RIOTBASE)/Makefile.base diff --git a/boards/sodaq-sara-aff/Makefile b/boards/sodaq-sara-aff/Makefile index c43a63297c..106a134b41 100644 --- a/boards/sodaq-sara-aff/Makefile +++ b/boards/sodaq-sara-aff/Makefile @@ -1,8 +1,8 @@ MODULE = board -ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE))) - # Add the samd21-arduino-bootloader directory to the build - DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE))) + # Add the samdx1-arduino-bootloader directory to the build + DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader endif include $(RIOTBASE)/Makefile.base diff --git a/boards/sodaq-sara-sff/Makefile b/boards/sodaq-sara-sff/Makefile index c43a63297c..106a134b41 100644 --- a/boards/sodaq-sara-sff/Makefile +++ b/boards/sodaq-sara-sff/Makefile @@ -1,8 +1,8 @@ MODULE = board -ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE))) - # Add the samd21-arduino-bootloader directory to the build - DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE))) + # Add the samdx1-arduino-bootloader directory to the build + DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader endif include $(RIOTBASE)/Makefile.base diff --git a/boards/wemos-zero/Makefile b/boards/wemos-zero/Makefile index 128e7c51a4..d955459421 100644 --- a/boards/wemos-zero/Makefile +++ b/boards/wemos-zero/Makefile @@ -1,6 +1,6 @@ MODULE = board -DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader +DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader DIRS += $(RIOTBOARD)/common/arduino-zero include $(RIOTBASE)/Makefile.base diff --git a/boards/wemos-zero/Makefile.dep b/boards/wemos-zero/Makefile.dep index c9598d4c16..aaa033ce1c 100644 --- a/boards/wemos-zero/Makefile.dep +++ b/boards/wemos-zero/Makefile.dep @@ -1,4 +1,4 @@ include $(RIOTBOARD)/common/arduino-zero/Makefile.dep # setup the samd21 arduino bootloader related dependencies -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep diff --git a/boards/wemos-zero/Makefile.include b/boards/wemos-zero/Makefile.include index 53df6b4cd7..18e6d45dde 100644 --- a/boards/wemos-zero/Makefile.include +++ b/boards/wemos-zero/Makefile.include @@ -1,5 +1,5 @@ CFLAGS += -DBOOTLOADER_UF2 # Include all definitions for flashing with bossa other USB -include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include +include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include include $(RIOTBOARD)/common/arduino-zero/Makefile.include