From b8366cf9a5cf87336352b9862cd536660d243a12 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Mon, 2 Sep 2019 13:13:40 +0200
Subject: arch makefiles: consistently use $SERIAL_PORT

---
 src/arch/arduino-nano-168/Makefile.inc | 12 ++++++------
 src/arch/arduino-nano/Makefile.inc     | 12 ++++++------
 src/arch/blinkenrocket/Makefile.inc    |  8 ++++----
 src/arch/esp8266/Makefile.inc          |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/arch/arduino-nano-168/Makefile.inc b/src/arch/arduino-nano-168/Makefile.inc
index 868af3b..3b72c4d 100644
--- a/src/arch/arduino-nano-168/Makefile.inc
+++ b/src/arch/arduino-nano-168/Makefile.inc
@@ -1,7 +1,7 @@
 # vim:ft=make
 
 MCU = atmega168
-PORT = /dev/ttyUSB0
+SERIAL_PORT ?= /dev/ttyUSB0
 BAUD = 19200
 
 cpu_freq ?= 16000000
@@ -90,24 +90,24 @@ build/system.hex: build/system.elf
 	${QUIET}${OBJCOPY} -O ihex ${@:.hex=.elf} $@
 
 program: build/system.hex
-	${QUIET}avrdude -p ${MCU} -c arduino -P ${PORT} -b ${BAUD} -U flash:w:build/system.hex
+	${QUIET}avrdude -p ${MCU} -c arduino -P ${SERIAL_PORT} -b ${BAUD} -U flash:w:build/system.hex
 
 arch_clean:
 	${QUIET}rm -f ${OBJECTS} build/system.hex
 
 monitor:
-	${QUIET}screen ${PORT} ${uart_baud}
+	${QUIET}screen ${SERIAL_PORT} ${uart_baud}
 
 arch_help:
 	@echo "arduino-nano specific flags:"
-	@echo "    PORT = ${PORT}"
-	@echo "    BAUD = ${BAUD} (only used for programming)"
+	@echo " SERIAL_PORT = ${SERIAL_PORT}"
+	@echo "        BAUD = ${BAUD} (only used for programming)"
 
 arch_info:
 	@echo "CPU   Freq: ${cpu_freq} Hz"
 	@echo "Timer Freq: ${timer_freq} Hz"
 	@echo "I2C   Freq: ${i2c_freq} Hz"
 	@echo "Counter Overflow: 65536/255"
-	@echo "Monitor: ${PORT} ${uart_baud}"
+	@echo "Monitor: ${SERIAL_PORT} ${uart_baud}"
 
 .PHONY: arch_clean arch_help arch_info monitor program
diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index 1abd217..367a4ba 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -1,7 +1,7 @@
 # vim:ft=make
 
 MCU = atmega328p
-PORT = /dev/ttyUSB0
+SERIAL_PORT ?= /dev/ttyUSB0
 BAUD = 57600
 
 cpu_freq ?= 16000000
@@ -90,24 +90,24 @@ build/system.hex: build/system.elf
 	${QUIET}${OBJCOPY} -O ihex ${@:.hex=.elf} $@
 
 program: build/system.hex
-	${QUIET}avrdude -p ${MCU} -c arduino -P ${PORT} -b ${BAUD} -U flash:w:build/system.hex
+	${QUIET}avrdude -p ${MCU} -c arduino -P ${SERIAL_PORT} -b ${BAUD} -U flash:w:build/system.hex
 
 arch_clean:
 	${QUIET}rm -f ${OBJECTS} build/system.hex
 
 monitor:
-	${QUIET}screen ${PORT} ${uart_baud}
+	${QUIET}screen ${SERIAL_PORT} ${uart_baud}
 
 arch_help:
 	@echo "arduino-nano specific flags:"
-	@echo "    PORT = ${PORT}"
-	@echo "    BAUD = ${BAUD} (only used for programming)"
+	@echo " SERIAL_PORT = ${SERIAL_PORT}"
+	@echo "        BAUD = ${BAUD} (only used for programming)"
 
 arch_info:
 	@echo "CPU   Freq: ${cpu_freq} Hz"
 	@echo "Timer Freq: ${timer_freq} Hz"
 	@echo "I2C   Freq: ${i2c_freq} Hz"
 	@echo "Counter Overflow: 65536/255"
-	@echo "Monitor: ${PORT} ${uart_baud}"
+	@echo "Monitor: ${SERIAL_PORT} ${uart_baud}"
 
 .PHONY: arch_clean arch_help arch_info monitor program
diff --git a/src/arch/blinkenrocket/Makefile.inc b/src/arch/blinkenrocket/Makefile.inc
index 9b19857..0cfb2e0 100644
--- a/src/arch/blinkenrocket/Makefile.inc
+++ b/src/arch/blinkenrocket/Makefile.inc
@@ -1,7 +1,7 @@
 # vim:ft=make
 
 MCU = attiny88
-PORT = /dev/ttyUSB0
+SERIAL_PORT ?= /dev/ttyUSB0
 
 COMMON_FLAGS += -mmcu=${MCU} -DF_CPU=8000000UL -DMULTIPASS_ARCH_blinkenrocket
 COMMON_FLAGS += -flto
@@ -51,17 +51,17 @@ arch_clean:
 	rm -f ${OBJECTS} build/system.hex
 
 monitor:
-	screen ${PORT} 115200
+	screen ${SERIAL_PORT} 115200
 
 arch_help:
 	@echo "blinkenrocket specific flags:"
-	@echo "    PORT = ${PORT}"
+	@echo "    SERIAL_PORT = ${SERIAL_PORT}"
 
 arch_info:
 	@echo "CPU   Freq: ${cpu_freq} Hz"
 	@echo "Timer Freq: ${timer_freq} Hz"
 	@echo "I2C   Freq: ${i2c_freq} Hz"
 	@echo "Counter Overflow: ?/?"
-	@echo "Monitor: ${PORT} 115200"
+	@echo "Monitor: ${SERIAL_PORT} 115200"
 
 .PHONY: arch_clean arch_help arch_info monitor program
diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc
index b709fc0..70b319e 100644
--- a/src/arch/esp8266/Makefile.inc
+++ b/src/arch/esp8266/Makefile.inc
@@ -3,7 +3,7 @@
 TOOLCHAIN_BASE ?= /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/bin
 SDK_BASE ?= /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/xtensa-lx106-elf/sysroot/usr
 ESPTOOL ?= esptool
-PORT ?= /dev/ttyUSB0
+SERIAL_PORT ?= /dev/ttyUSB0
 
 CC = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-gcc
 CXX = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-g++
@@ -82,10 +82,10 @@ arch_help:
 	@echo "    TOOLCHAIN_BASE = /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/bin"
 	@echo "    SDK_BASE = /home/derf/var/projects/esp8266/toolchain/xtensa-lx106-elf/xtensa-lx106-elf/sysroot/usr"
 	@echo "    ESPTOOL = esptool"
-	@echo "    PORT = /dev/ttyUSB0"
+	@echo "    SERIAL_PORT = /dev/ttyUSB0"
 
 arch_info:
 	@echo "Counter Overflow: 4294967296/0"
-	@echo "Monitor: /dev/ttyUSB0 115200"
+	@echo "Monitor: ${SERIAL_PORT} 115200"
 
 .PHONY: arch_clean arch_help arch_info monitor program
-- 
cgit v1.2.3