From 17b890c16ea5804822d96d4c4f6b4e8ee5ddfa57 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Thu, 4 Jun 2020 20:00:25 +0200 Subject: [PATCH] boards/{arduino,wemos}-zero: Dedpulicated code --- boards/arduino-zero/Makefile.include | 1 - boards/common/arduino-zero/Makefile.include | 2 ++ boards/wemos-zero/Makefile.include | 13 ------------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/boards/arduino-zero/Makefile.include b/boards/arduino-zero/Makefile.include index 703194d6c6..5d8500e141 100644 --- a/boards/arduino-zero/Makefile.include +++ b/boards/arduino-zero/Makefile.include @@ -1,2 +1 @@ include $(RIOTBOARD)/common/arduino-zero/Makefile.include -include $(RIOTMAKE)/boards/sam0.inc.mk diff --git a/boards/common/arduino-zero/Makefile.include b/boards/common/arduino-zero/Makefile.include index 12987e21e4..4c42296a74 100644 --- a/boards/common/arduino-zero/Makefile.include +++ b/boards/common/arduino-zero/Makefile.include @@ -1,3 +1,5 @@ INCLUDES += -I$(RIOTBOARD)/common/arduino-zero/include OPENOCD_CONFIG ?= $(RIOTBOARD)/common/arduino-zero/dist/openocd.cfg + +include $(RIOTMAKE)/boards/sam0.inc.mk diff --git a/boards/wemos-zero/Makefile.include b/boards/wemos-zero/Makefile.include index e0085c0588..53df6b4cd7 100644 --- a/boards/wemos-zero/Makefile.include +++ b/boards/wemos-zero/Makefile.include @@ -1,18 +1,5 @@ -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - CFLAGS += -DBOOTLOADER_UF2 -# setup serial terminal -include $(RIOTMAKE)/tools/serial.inc.mk - -# setup the flash tool used -ifeq ($(PROGRAMMER),jlink) - # in case J-Link is attached to SWD pins, use a plain CPU memory model - JLINK_DEVICE := atsamd21 - include $(RIOTMAKE)/tools/jlink.inc.mk -endif - # Include all definitions for flashing with bossa other USB include $(RIOTBOARD)/common/samd21-arduino-bootloader/Makefile.include include $(RIOTBOARD)/common/arduino-zero/Makefile.include