From f8822b5f8f3bb97bc8a8cd1d2ff4edc25543b06a Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 20 Nov 2020 11:00:21 +0100 Subject: [PATCH] boards: remove not need PORT_LINUX/PORT_DARWIN They defined the same in serial.inc.mk. Some Darwin default are changed because they are probably wrong --- boards/arduino-mega2560/Makefile.include | 2 -- boards/arduino-uno/Makefile.include | 2 -- boards/atmega256rfr2-xpro/Makefile.include | 4 ---- boards/b-l072z-lrwan1/Makefile.include | 4 ---- boards/b-l475e-iot01a/Makefile.include | 4 ---- boards/calliope-mini/Makefile.include | 4 ---- boards/cc1312-launchpad/Makefile.include | 4 ---- boards/cc1352-launchpad/Makefile.include | 4 ---- boards/cc1352p-launchpad/Makefile.include | 4 ---- boards/cc2650-launchpad/Makefile.include | 4 ---- boards/cc2650stk/Makefile.include | 4 ---- boards/common/arduino-due/Makefile.include | 4 ---- boards/common/arduino-mkr/Makefile.include | 3 --- boards/common/frdm/Makefile.include | 7 ------- boards/common/nrf52/Makefile.include | 4 ---- boards/common/slwstk6000b/Makefile.include | 4 ---- boards/common/sodaq/Makefile.include | 3 --- boards/ek-lm4f120xl/Makefile.include | 4 ---- boards/feather-m0/Makefile.include | 3 --- boards/hifive1b/Makefile.include | 4 ---- boards/i-nucleo-lrwan1/Makefile.include | 4 ---- boards/ikea-tradfri/Makefile.include | 4 ---- boards/lsn50/Makefile.include | 4 ---- boards/maple-mini/Makefile.include | 4 ---- boards/mbed_lpc1768/Makefile.include | 1 - boards/mega-xplained/Makefile.include | 2 -- boards/microbit/Makefile.include | 1 - boards/nrf51dk/Makefile.include | 1 - boards/nrf51dongle/Makefile.include | 1 - boards/nucleo-l496zg/Makefile.include | 5 ----- boards/nucleo-l4r5zi/Makefile.include | 4 ---- boards/opencm904/Makefile.include | 4 ---- boards/p-l496g-cell02/Makefile.include | 4 ---- boards/pba-d-01-kw2x/Makefile.include | 4 ---- boards/sensebox_samd21/Makefile.include | 3 --- boards/slstk3401a/Makefile.include | 4 ---- boards/slstk3402a/Makefile.include | 4 ---- boards/sltb001a/Makefile.include | 4 ---- boards/slwstk6220a/Makefile.include | 4 ---- boards/stk3200/Makefile.include | 4 ---- boards/stk3600/Makefile.include | 4 ---- boards/stk3700/Makefile.include | 4 ---- boards/stm32f429i-disc1/Makefile.include | 4 ---- boards/stm32f723e-disco/Makefile.include | 4 ---- boards/stm32f769i-disco/Makefile.include | 4 ---- boards/stm32l476g-disco/Makefile.include | 4 ---- boards/stm32mp157c-dk2/Makefile.include | 4 ---- boards/teensy31/Makefile.include | 1 - boards/ublox-c030-u201/Makefile.include | 4 ---- boards/waspmote-pro/Makefile.include | 1 - makefiles/boards/sam0.inc.mk | 3 --- makefiles/boards/stm32.inc.mk | 4 ---- 52 files changed, 183 deletions(-) diff --git a/boards/arduino-mega2560/Makefile.include b/boards/arduino-mega2560/Makefile.include index 2e7e5c42ef..5745b15c7b 100644 --- a/boards/arduino-mega2560/Makefile.include +++ b/boards/arduino-mega2560/Makefile.include @@ -1,6 +1,4 @@ # configure the terminal program -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) BAUD ?= 9600 ARDUINO_MEGA2560_BOOTLOADER ?= stk500v2 diff --git a/boards/arduino-uno/Makefile.include b/boards/arduino-uno/Makefile.include index 396b651e0a..03869126c0 100644 --- a/boards/arduino-uno/Makefile.include +++ b/boards/arduino-uno/Makefile.include @@ -1,6 +1,4 @@ # configure the terminal program -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) BAUD ?= 9600 ARDUINO_UNO_BOOTLOADER ?= optiboot diff --git a/boards/atmega256rfr2-xpro/Makefile.include b/boards/atmega256rfr2-xpro/Makefile.include index 9ec62cab0a..a35ba6cca0 100644 --- a/boards/atmega256rfr2-xpro/Makefile.include +++ b/boards/atmega256rfr2-xpro/Makefile.include @@ -1,7 +1,3 @@ -# configure the terminal program -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) -BAUD ?= 115200 # Use EDBG (xplainedpro) programmer with avrdude AVRDUDE_PROGRAMMER ?= xplainedpro diff --git a/boards/b-l072z-lrwan1/Makefile.include b/boards/b-l072z-lrwan1/Makefile.include index f00504161d..e338e4ccbb 100644 --- a/boards/b-l072z-lrwan1/Makefile.include +++ b/boards/b-l072z-lrwan1/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board has an on-board ST-link adapter PROGRAMMER ?= openocd DEBUG_ADAPTER ?= stlink diff --git a/boards/b-l475e-iot01a/Makefile.include b/boards/b-l475e-iot01a/Makefile.include index bff5fddfda..898aadf4d7 100644 --- a/boards/b-l475e-iot01a/Makefile.include +++ b/boards/b-l475e-iot01a/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board has an on-board ST-link adapter PROGRAMMER ?= openocd DEBUG_ADAPTER ?= stlink diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index 10b281bb76..0056b2f764 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -1,7 +1,3 @@ -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # for this board we support flashing via openocd or pyocd PROGRAMMER ?= openocd diff --git a/boards/cc1312-launchpad/Makefile.include b/boards/cc1312-launchpad/Makefile.include index ca489d3c94..8ef6a9b5e3 100644 --- a/boards/cc1312-launchpad/Makefile.include +++ b/boards/cc1312-launchpad/Makefile.include @@ -1,8 +1,4 @@ XDEBUGGER = XDS110 -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # configure the flash tool include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include diff --git a/boards/cc1352-launchpad/Makefile.include b/boards/cc1352-launchpad/Makefile.include index ca489d3c94..8ef6a9b5e3 100644 --- a/boards/cc1352-launchpad/Makefile.include +++ b/boards/cc1352-launchpad/Makefile.include @@ -1,8 +1,4 @@ XDEBUGGER = XDS110 -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # configure the flash tool include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include diff --git a/boards/cc1352p-launchpad/Makefile.include b/boards/cc1352p-launchpad/Makefile.include index ca489d3c94..8ef6a9b5e3 100644 --- a/boards/cc1352p-launchpad/Makefile.include +++ b/boards/cc1352p-launchpad/Makefile.include @@ -1,8 +1,4 @@ XDEBUGGER = XDS110 -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # configure the flash tool include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include diff --git a/boards/cc2650-launchpad/Makefile.include b/boards/cc2650-launchpad/Makefile.include index 237a42bbba..bb150c86dc 100644 --- a/boards/cc2650-launchpad/Makefile.include +++ b/boards/cc2650-launchpad/Makefile.include @@ -1,8 +1,4 @@ XDEBUGGER = XDS110 -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # configure the flash tool PROGRAMMER ?= uniflash diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include index 313e12aa33..bb150c86dc 100644 --- a/boards/cc2650stk/Makefile.include +++ b/boards/cc2650stk/Makefile.include @@ -1,8 +1,4 @@ XDEBUGGER = XDS110 -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # configure the flash tool PROGRAMMER ?= uniflash diff --git a/boards/common/arduino-due/Makefile.include b/boards/common/arduino-due/Makefile.include index d57f8dcaf9..dd9c435bc7 100644 --- a/boards/common/arduino-due/Makefile.include +++ b/boards/common/arduino-due/Makefile.include @@ -1,10 +1,6 @@ # export this module and its includes INCLUDES += -I$(RIOTBOARD)/common/arduino-due/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup flasher (using BOSSA) PROGRAMMER ?= bossa BOSSA_VERSION = 1.8 diff --git a/boards/common/arduino-mkr/Makefile.include b/boards/common/arduino-mkr/Makefile.include index 0153b0a0b5..68760aa9b7 100644 --- a/boards/common/arduino-mkr/Makefile.include +++ b/boards/common/arduino-mkr/Makefile.include @@ -1,6 +1,3 @@ -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup the flash tool used ifeq ($(PROGRAMMER),jlink) # in case J-Link is attached to SWD pins, use a plain CPU memory model diff --git a/boards/common/frdm/Makefile.include b/boards/common/frdm/Makefile.include index 1ac4ff1a75..3aac5f529d 100644 --- a/boards/common/frdm/Makefile.include +++ b/boards/common/frdm/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # Use OpenOCD by default PROGRAMMER ?= openocd @@ -28,6 +24,3 @@ PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield.sh # The board can become un-flashable after some execution, # use connect_assert_srst to always be able to flash or reset the board. OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1 - -# setup serial terminal -include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include index 206f6689ec..18a81b7fd1 100644 --- a/boards/common/nrf52/Makefile.include +++ b/boards/common/nrf52/Makefile.include @@ -6,10 +6,6 @@ ifeq (bmp,$(PROGRAMMER)) # the second is the BMP's UART interface PORT_LINUX ?= /dev/ttyACM1 PORT_DARWIN ?= $(wordlist 2, 2, $(sort $(wildcard /dev/tty.usbmodem*))) -else - # configure the serial terminal - PORT_LINUX ?= /dev/ttyACM0 - PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) endif PROGRAMMER ?= jlink diff --git a/boards/common/slwstk6000b/Makefile.include b/boards/common/slwstk6000b/Makefile.include index 2fb40f8047..53349f80fa 100644 --- a/boards/common/slwstk6000b/Makefile.include +++ b/boards/common/slwstk6000b/Makefile.include @@ -2,10 +2,6 @@ INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include # add BOARD_MODULE specific includes INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk JLINK_DEVICE = $(word 2, $(SLWSTK6000B_MAINBOARD_VARS_$(BOARD_MODULE))) diff --git a/boards/common/sodaq/Makefile.include b/boards/common/sodaq/Makefile.include index 9375eea379..95dcecc8eb 100644 --- a/boards/common/sodaq/Makefile.include +++ b/boards/common/sodaq/Makefile.include @@ -1,6 +1,3 @@ -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # Add board common includes INCLUDES += -I$(RIOTBOARD)/common/sodaq/include diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include index dff930825e..003e851b55 100644 --- a/boards/ek-lm4f120xl/Makefile.include +++ b/boards/ek-lm4f120xl/Makefile.include @@ -1,6 +1,2 @@ -#define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board uses openocd PROGRAMMER ?= openocd diff --git a/boards/feather-m0/Makefile.include b/boards/feather-m0/Makefile.include index 85ecfd8630..0576a83330 100644 --- a/boards/feather-m0/Makefile.include +++ b/boards/feather-m0/Makefile.include @@ -1,6 +1,3 @@ -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup the flash tool used ifeq ($(PROGRAMMER),jlink) # in case J-Link is attached to SWD pins, use a plain CPU memory model diff --git a/boards/hifive1b/Makefile.include b/boards/hifive1b/Makefile.include index e0845372b0..2774c36018 100644 --- a/boards/hifive1b/Makefile.include +++ b/boards/hifive1b/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # Set default programmer as jlink PROGRAMMER ?= jlink diff --git a/boards/i-nucleo-lrwan1/Makefile.include b/boards/i-nucleo-lrwan1/Makefile.include index 2f70135b8b..ca7d260ae0 100644 --- a/boards/i-nucleo-lrwan1/Makefile.include +++ b/boards/i-nucleo-lrwan1/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # to flash this board, use an ST-link adapter DEBUG_ADAPTER ?= stlink diff --git a/boards/ikea-tradfri/Makefile.include b/boards/ikea-tradfri/Makefile.include index 08594d404a..5f69ec0b78 100644 --- a/boards/ikea-tradfri/Makefile.include +++ b/boards/ikea-tradfri/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing PROGRAMMER ?= jlink JLINK_DEVICE = EFR32MG1PxxxF256 diff --git a/boards/lsn50/Makefile.include b/boards/lsn50/Makefile.include index 0b15e443f4..e4c8f9820c 100644 --- a/boards/lsn50/Makefile.include +++ b/boards/lsn50/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board uses openocd PROGRAMMER ?= openocd # this board can become un-flashable after a hardfault, diff --git a/boards/maple-mini/Makefile.include b/boards/maple-mini/Makefile.include index b67fcbdb6e..e8a5f09c5b 100644 --- a/boards/maple-mini/Makefile.include +++ b/boards/maple-mini/Makefile.include @@ -1,10 +1,6 @@ # Include shared STM32 headers INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # this board uses openocd with st-link PROGRAMMER ?= openocd DEBUG_ADAPTER ?= stlink diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index 9cb3529458..86c04e4655 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -7,5 +7,4 @@ FFLAGS = $(FLASHFILE) DEBUGGER_FLAGS = # define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/mega-xplained/Makefile.include b/boards/mega-xplained/Makefile.include index 2b6c726706..a259537114 100644 --- a/boards/mega-xplained/Makefile.include +++ b/boards/mega-xplained/Makefile.include @@ -18,8 +18,6 @@ else ifeq ($(OS),Darwin) endif # configure the terminal program -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) BAUD ?= 9600 include $(RIOTBOARD)/common/atmega/Makefile.include diff --git a/boards/microbit/Makefile.include b/boards/microbit/Makefile.include index 723e24aef0..4ffe2f5baa 100644 --- a/boards/microbit/Makefile.include +++ b/boards/microbit/Makefile.include @@ -1,5 +1,4 @@ # define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # for this board we support flashing via openocd or pyocd diff --git a/boards/nrf51dk/Makefile.include b/boards/nrf51dk/Makefile.include index 97b74cb6a4..3d37efd9e9 100644 --- a/boards/nrf51dk/Makefile.include +++ b/boards/nrf51dk/Makefile.include @@ -1,5 +1,4 @@ # define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # use openocd by default to program this board diff --git a/boards/nrf51dongle/Makefile.include b/boards/nrf51dongle/Makefile.include index 779a4cc62e..9fb8033207 100644 --- a/boards/nrf51dongle/Makefile.include +++ b/boards/nrf51dongle/Makefile.include @@ -1,5 +1,4 @@ # define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # use jlink to program this board diff --git a/boards/nucleo-l496zg/Makefile.include b/boards/nucleo-l496zg/Makefile.include index bdc9e713f5..a7e3adb0d8 100644 --- a/boards/nucleo-l496zg/Makefile.include +++ b/boards/nucleo-l496zg/Makefile.include @@ -1,7 +1,2 @@ -# stdio is not available over st-link but on the Arduino TX/RX pins -# A serial to USB converter plugged to the host is required -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/nucleo-l4r5zi/Makefile.include b/boards/nucleo-l4r5zi/Makefile.include index f4e68472a8..a7e3adb0d8 100644 --- a/boards/nucleo-l4r5zi/Makefile.include +++ b/boards/nucleo-l4r5zi/Makefile.include @@ -1,6 +1,2 @@ -# stdio is available over st-link -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # load the common Makefile.include for Nucleo boards include $(RIOTBOARD)/common/nucleo144/Makefile.include diff --git a/boards/opencm904/Makefile.include b/boards/opencm904/Makefile.include index b779e70df9..96c1876bc8 100644 --- a/boards/opencm904/Makefile.include +++ b/boards/opencm904/Makefile.include @@ -1,10 +1,6 @@ # Include shared STM32 headers INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # custom flasher to use with the bootloader PROGRAMMER ?= robotis-loader diff --git a/boards/p-l496g-cell02/Makefile.include b/boards/p-l496g-cell02/Makefile.include index dc5d54cf77..988ecea6ea 100644 --- a/boards/p-l496g-cell02/Makefile.include +++ b/boards/p-l496g-cell02/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board uses openocd with st-link PROGRAMMER ?= openocd DEBUG_ADAPTER ?= stlink diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include index 2cc502a7aa..c196dafb78 100644 --- a/boards/pba-d-01-kw2x/Makefile.include +++ b/boards/pba-d-01-kw2x/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # 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="0200..." BOARD="pba-d-01-kw2x" make flash diff --git a/boards/sensebox_samd21/Makefile.include b/boards/sensebox_samd21/Makefile.include index d041b35395..8f06497edf 100644 --- a/boards/sensebox_samd21/Makefile.include +++ b/boards/sensebox_samd21/Makefile.include @@ -1,6 +1,3 @@ -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # by default, we use BOSSA to flash this board to take into account the # pre-flashed Arduino bootloader PROGRAMMER ?= bossa diff --git a/boards/slstk3401a/Makefile.include b/boards/slstk3401a/Makefile.include index f1520e964f..149d8aeebb 100644 --- a/boards/slstk3401a/Makefile.include +++ b/boards/slstk3401a/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_PRE_FLASH = r diff --git a/boards/slstk3402a/Makefile.include b/boards/slstk3402a/Makefile.include index f1520e964f..149d8aeebb 100644 --- a/boards/slstk3402a/Makefile.include +++ b/boards/slstk3402a/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_PRE_FLASH = r diff --git a/boards/sltb001a/Makefile.include b/boards/sltb001a/Makefile.include index bbea4b21d8..fd599d1dac 100644 --- a/boards/sltb001a/Makefile.include +++ b/boards/sltb001a/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_DEVICE = EFR32MG1PxxxF256 JLINK_PRE_FLASH = r diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include index f1520e964f..149d8aeebb 100644 --- a/boards/slwstk6220a/Makefile.include +++ b/boards/slwstk6220a/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_PRE_FLASH = r diff --git a/boards/stk3200/Makefile.include b/boards/stk3200/Makefile.include index f1520e964f..149d8aeebb 100644 --- a/boards/stk3200/Makefile.include +++ b/boards/stk3200/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_PRE_FLASH = r diff --git a/boards/stk3600/Makefile.include b/boards/stk3600/Makefile.include index f1520e964f..149d8aeebb 100644 --- a/boards/stk3600/Makefile.include +++ b/boards/stk3600/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_PRE_FLASH = r diff --git a/boards/stk3700/Makefile.include b/boards/stk3700/Makefile.include index f1520e964f..149d8aeebb 100644 --- a/boards/stk3700/Makefile.include +++ b/boards/stk3700/Makefile.include @@ -1,7 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # setup JLink for flashing JLINK_PRE_FLASH = r diff --git a/boards/stm32f429i-disc1/Makefile.include b/boards/stm32f429i-disc1/Makefile.include index 5ee79cd551..05207ccca1 100644 --- a/boards/stm32f429i-disc1/Makefile.include +++ b/boards/stm32f429i-disc1/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # this board uses openocd PROGRAMMER ?= openocd # this board has an on-board ST-link adapter diff --git a/boards/stm32f723e-disco/Makefile.include b/boards/stm32f723e-disco/Makefile.include index 40d644f908..a40c78798c 100644 --- a/boards/stm32f723e-disco/Makefile.include +++ b/boards/stm32f723e-disco/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # this board uses openocd PROGRAMMER ?= openocd diff --git a/boards/stm32f769i-disco/Makefile.include b/boards/stm32f769i-disco/Makefile.include index 8146a39d45..d52570eccd 100644 --- a/boards/stm32f769i-disco/Makefile.include +++ b/boards/stm32f769i-disco/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # this board uses openocd with st-link PROGRAMMER ?= openocd diff --git a/boards/stm32l476g-disco/Makefile.include b/boards/stm32l476g-disco/Makefile.include index dc5d54cf77..988ecea6ea 100644 --- a/boards/stm32l476g-disco/Makefile.include +++ b/boards/stm32l476g-disco/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board uses openocd with st-link PROGRAMMER ?= openocd DEBUG_ADAPTER ?= stlink diff --git a/boards/stm32mp157c-dk2/Makefile.include b/boards/stm32mp157c-dk2/Makefile.include index c9654a106b..afceece793 100644 --- a/boards/stm32mp157c-dk2/Makefile.include +++ b/boards/stm32mp157c-dk2/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - # this board has an on-board ST-link adapter DEBUG_ADAPTER = stlink-dap OPENOCD_CORE = stm32mp15x.cm4 diff --git a/boards/teensy31/Makefile.include b/boards/teensy31/Makefile.include index 702ed04a8e..a9ea9e5725 100644 --- a/boards/teensy31/Makefile.include +++ b/boards/teensy31/Makefile.include @@ -10,7 +10,6 @@ ifeq ($(TEENSY_LOADER),$(FLASHER)) endif # define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-*))) $(TEENSY_LOADER): diff --git a/boards/ublox-c030-u201/Makefile.include b/boards/ublox-c030-u201/Makefile.include index 49945d5f5b..62f5f72809 100644 --- a/boards/ublox-c030-u201/Makefile.include +++ b/boards/ublox-c030-u201/Makefile.include @@ -1,10 +1,6 @@ # we use shared STM32 configuration snippets INCLUDES += -I$(RIOTBOARD)/common/stm32/include -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) - # this board uses openocd with st-link PROGRAMMER ?= openocd diff --git a/boards/waspmote-pro/Makefile.include b/boards/waspmote-pro/Makefile.include index 91280522db..006b32a4b9 100644 --- a/boards/waspmote-pro/Makefile.include +++ b/boards/waspmote-pro/Makefile.include @@ -1,5 +1,4 @@ # configure the terminal program -PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) BAUD ?= 9600 WASPMOTE_PRO_BOOTLOADER ?= stk500v1 diff --git a/makefiles/boards/sam0.inc.mk b/makefiles/boards/sam0.inc.mk index d49fb37221..e529e3ac64 100644 --- a/makefiles/boards/sam0.inc.mk +++ b/makefiles/boards/sam0.inc.mk @@ -1,6 +1,3 @@ -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # Use DEBUG_ADAPTER_ID to specify the programmer serial number to use: # DEBUG_ADAPTER_ID="ATML..." diff --git a/makefiles/boards/stm32.inc.mk b/makefiles/boards/stm32.inc.mk index 0b88587e5b..04781cf95e 100644 --- a/makefiles/boards/stm32.inc.mk +++ b/makefiles/boards/stm32.inc.mk @@ -11,10 +11,6 @@ ifeq (bmp,$(PROGRAMMER)) # the second is the BMP's UART interface PORT_LINUX ?= /dev/ttyACM1 PORT_DARWIN ?= $(wordlist 2, 2, $(sort $(wildcard /dev/tty.usbmodem*))) -else - # configure the serial terminal - PORT_LINUX ?= /dev/ttyACM0 - PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) endif ifeq (openocd,$(PROGRAMMER))