mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #15972 from benpicco/samdx1-arduino-bootloader
boards/samd21-arduino-bootloader: rename to samdx1-arduino-bootloader
This commit is contained in:
commit
e167131c05
@ -1,5 +1,5 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS = $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -8,4 +8,4 @@ ifneq (,$(filter mtd,$(USEMODULE)))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
CFLAGS += -DBOOTLOADER_UF2
|
CFLAGS += -DBOOTLOADER_UF2
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa other USB
|
# 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 handling of serial and non-bossa programmers (if selected by user)
|
||||||
include $(RIOTMAKE)/boards/sam0.inc.mk
|
include $(RIOTMAKE)/boards/sam0.inc.mk
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS = $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -2,7 +2,7 @@ PORT_LINUX ?= /dev/ttyACM0
|
|||||||
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
|
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa over USB
|
# 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 handling of serial and non-bossa programmers (if selected by user)
|
||||||
include $(RIOTMAKE)/boards/sam0.inc.mk
|
include $(RIOTMAKE)/boards/sam0.inc.mk
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
MODULE = boards_common_arduino-mkr
|
MODULE = boards_common_arduino-mkr
|
||||||
|
|
||||||
ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE)))
|
ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE)))
|
||||||
# Add the samd21-arduino-bootloader directory to the build
|
# Add the samdx1-arduino-bootloader directory to the build
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -5,6 +5,6 @@ ifeq ($(PROGRAMMER),jlink)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa over USB
|
# 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
|
INCLUDES += -I$(RIOTBOARD)/common/arduino-mkr/include
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
MODULE = boards_common_samd21-arduino-bootloader
|
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
|
3
boards/common/samdx1-arduino-bootloader/Makefile
Normal file
3
boards/common/samdx1-arduino-bootloader/Makefile
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
MODULE = boards_common_samdx1-arduino-bootloader
|
||||||
|
|
||||||
|
include $(RIOTBASE)/Makefile.base
|
@ -2,6 +2,6 @@ include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk
|
|||||||
|
|
||||||
# USB Board reset only works if CDC ACM is used
|
# USB Board reset only works if CDC ACM is used
|
||||||
ifneq (,$(filter stdio_cdc_acm,$(USEMODULE)))
|
ifneq (,$(filter stdio_cdc_acm,$(USEMODULE)))
|
||||||
USEMODULE += boards_common_samd21-arduino-bootloader
|
USEMODULE += boards_common_samdx1-arduino-bootloader
|
||||||
USEMODULE += usb_board_reset
|
USEMODULE += usb_board_reset
|
||||||
endif
|
endif
|
@ -1,8 +1,8 @@
|
|||||||
MODULE = boards_common_sodaq
|
MODULE = boards_common_sodaq
|
||||||
|
|
||||||
ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE)))
|
ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE)))
|
||||||
# Add the samd21-arduino-bootloader directory to the build
|
# Add the samdx1-arduino-bootloader directory to the build
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -2,4 +2,4 @@
|
|||||||
INCLUDES += -I$(RIOTBOARD)/common/sodaq/include
|
INCLUDES += -I$(RIOTBOARD)/common/sodaq/include
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa over USB
|
# 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
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE)))
|
ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE)))
|
||||||
# Add the samd21-arduino-bootloader directory to the build
|
# Add the samdx1-arduino-bootloader directory to the build
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -3,4 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -5,4 +5,4 @@ ifeq ($(PROGRAMMER),jlink)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa over USB
|
# 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
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS = $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -7,4 +7,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
CFLAGS += -DBOOTLOADER_UF2
|
CFLAGS += -DBOOTLOADER_UF2
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa other USB
|
# 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 handling of serial and non-bossa programmers (if selected by user)
|
||||||
include $(RIOTMAKE)/boards/sam0.inc.mk
|
include $(RIOTMAKE)/boards/sam0.inc.mk
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE)))
|
ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE)))
|
||||||
# Add the samd21-arduino-bootloader directory to the build
|
# Add the samdx1-arduino-bootloader directory to the build
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE)))
|
ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE)))
|
||||||
# Add the samd21-arduino-bootloader directory to the build
|
# Add the samdx1-arduino-bootloader directory to the build
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
ifneq (,$(filter boards_common_samd21-arduino-bootloader,$(USEMODULE)))
|
ifneq (,$(filter boards_common_samdx1-arduino-bootloader,$(USEMODULE)))
|
||||||
# Add the samd21-arduino-bootloader directory to the build
|
# Add the samdx1-arduino-bootloader directory to the build
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
MODULE = board
|
MODULE = board
|
||||||
|
|
||||||
DIRS += $(RIOTBOARD)/common/samd21-arduino-bootloader
|
DIRS += $(RIOTBOARD)/common/samdx1-arduino-bootloader
|
||||||
DIRS += $(RIOTBOARD)/common/arduino-zero
|
DIRS += $(RIOTBOARD)/common/arduino-zero
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
include $(RIOTBOARD)/common/arduino-zero/Makefile.dep
|
include $(RIOTBOARD)/common/arduino-zero/Makefile.dep
|
||||||
|
|
||||||
# setup the samd21 arduino bootloader related dependencies
|
# setup the samd21 arduino bootloader related dependencies
|
||||||
include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.dep
|
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CFLAGS += -DBOOTLOADER_UF2
|
CFLAGS += -DBOOTLOADER_UF2
|
||||||
|
|
||||||
# Include all definitions for flashing with bossa other USB
|
# 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
|
include $(RIOTBOARD)/common/arduino-zero/Makefile.include
|
||||||
|
Loading…
Reference in New Issue
Block a user