From 0e064357f4d0012d0e3386ef19e2f110c79a20a1 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 20 Jul 2015 13:37:39 +0200 Subject: [PATCH 1/2] makefile: use /etc/avrdude/avrdude.conf on linux No need to look for arduino specific avrdude configuration as distributions ship their own avrdude.conf file that is compatible with arduino. --- Marlin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Makefile b/Marlin/Makefile index b22cca671..bc3b7136f 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -350,7 +350,7 @@ LDFLAGS = -lm AVRDUDE_PORT = $(UPLOAD_PORT) AVRDUDE_WRITE_FLASH = -Uflash:w:$(BUILD_DIR)/$(TARGET).hex:i ifeq ($(shell uname -s), Linux) -AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avrdude.conf +AVRDUDE_CONF = /etc/avrdude/avrdude.conf else AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf endif From 1183c10a2e28a2984398f8f4fea35653c9797a69 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 20 Jul 2015 13:38:52 +0200 Subject: [PATCH 2/2] makefile: drop -q -q (much quiet) from avrdude flags Annoying when trying to figure out if uploading actually does something. --- Marlin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Makefile b/Marlin/Makefile index bc3b7136f..684e949ac 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -354,7 +354,7 @@ AVRDUDE_CONF = /etc/avrdude/avrdude.conf else AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf endif -AVRDUDE_FLAGS = -q -q -D -C$(AVRDUDE_CONF) \ +AVRDUDE_FLAGS = -D -C$(AVRDUDE_CONF) \ -p$(MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) \ -b$(UPLOAD_RATE)