diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include
index 7f68e0eaa1bf70cfefc92dba352578d9d2d12274..acc6ee400b916fab5966c805f28874fb73b6b984 100644
--- a/boards/samr21-xpro/Makefile.include
+++ b/boards/samr21-xpro/Makefile.include
@@ -2,24 +2,4 @@
 export CPU = samd21
 export CPU_MODEL = samr21g18a
 
-# set default port depending on operating system
-PORT_LINUX ?= /dev/ttyACM0
-PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
-
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
-# Add board selector (USB serial) to OpenOCD options if specified.
-# Use /dist/tools/usb-serial/list-ttys.sh to find out serial number.
-#   Usage: SERIAL="ATML..." BOARD="samr21-xpro" make flash
-ifneq (,$(SERIAL))
-    export OPENOCD_EXTRA_INIT += "-c cmsis_dap_serial $(SERIAL)"
-    SERIAL_TTY = $(firstword $(shell $(RIOTBASE)/dist/tools/usb-serial/find-tty.sh $(SERIAL)))
-    ifeq (,$(SERIAL_TTY))
-        $(error Did not find a device with serial $(SERIAL))
-    endif
-    PORT_LINUX := $(SERIAL_TTY)
-endif
-
-# this board uses openocd
-include $(RIOTMAKE)/tools/openocd.inc.mk
+include $(RIOTMAKE)/boards/sam0.inc.mk