From 1f19a27e3cd5d0686dd65ecad6a171d025058b7c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Sep 2013 08:30:00 +1000
Subject: make upload on Linux much more reliable

Upload on Linux now only tries usb-3D_Robotics boards. This should
also make it handle more ports on MacOS
---
 makefiles/upload.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefiles')

diff --git a/makefiles/upload.mk b/makefiles/upload.mk
index 470ddfdf1..bc26d743d 100644
--- a/makefiles/upload.mk
+++ b/makefiles/upload.mk
@@ -12,10 +12,10 @@ SYSTYPE			:= $(shell uname -s)
 # XXX The uploader should be smarter than this.
 #
 ifeq ($(SYSTYPE),Darwin)
-SERIAL_PORTS		?= "/dev/tty.usbmodemPX1,/dev/tty.usbmodemPX2,/dev/tty.usbmodemPX3,/dev/tty.usbmodemPX4,/dev/tty.usbmodem1,/dev/tty.usbmodem2,/dev/tty.usbmodem3,/dev/tty.usbmodem4"
+SERIAL_PORTS		?= "/dev/tty.usbmodemPX*,/dev/tty.usbmodem*"
 endif
 ifeq ($(SYSTYPE),Linux)
-SERIAL_PORTS		?= "/dev/ttyACM5,/dev/ttyACM4,/dev/ttyACM3,/dev/ttyACM2,/dev/ttyACM1,/dev/ttyACM0"
+SERIAL_PORTS		?= "/dev/serial/by-id/usb-3D_Robotics*"
 endif
 ifeq ($(SERIAL_PORTS),)
 SERIAL_PORTS		 = "COM32,COM31,COM30,COM29,COM28,COM27,COM26,COM25,COM24,COM23,COM22,COM21,COM20,COM19,COM18,COM17,COM16,COM15,COM14,COM13,COM12,COM11,COM10,COM9,COM8,COM7,COM6,COM5,COM4,COM3,COM2,COM1,COM0"
-- 
cgit v1.2.3