Merge pull request #11039 from maribu/avrdude

makefiles/tools: Improved avrdude integration

boards/arduino-duemilanove/Makefile.include

@@ -10,8 +10,6 @@ BAUD        ?= 9600
 # using avrdude. Can be overridden for debugging (which requires changes
 # that require to use an ISP)
 PROGRAMMER ?= arduino
-# set mcu model for avrdude
-FFLAGS += -p m328p
 # configure programmer speed in baud
 FFLAGS_EXTRA += -b 57600
 

boards/arduino-mega2560/Makefile.include

@@ -12,8 +12,6 @@ BAUD        ?= 9600
 # using avrdude. Can be overridden for debugging (which requires changes
 # that require to use an ISP)
 PROGRAMMER ?= stk500v2
-# set mcu model for avrdude
-FFLAGS += -p m2560
 # configure programmer speed in baud
 FFLAGS_EXTRA += -b 115200
 

boards/arduino-uno/Makefile.include

@@ -10,8 +10,6 @@ BAUD        ?= 9600
 # using avrdude. Can be overridden for debugging (which requires changes
 # that require to use an ISP)
 PROGRAMMER ?= arduino
-# set mcu model for avrdude
-FFLAGS += -p m328p
 # configure programmer speed in baud
 FFLAGS_EXTRA += -b 115200
 

boards/jiminy-mega256rfr2/Makefile.include

@@ -15,8 +15,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # using avrdude. Can be overridden for debugging (which requires changes
 # that require to use an ISP)
 PROGRAMMER ?= wiring
-# set mcu model for avrdude (mandatory)
-FFLAGS += -p atmega256rfr2
 # Serial Baud rate for flasher is configured to 500kBaud
 # see /usr/include/asm-generic/termbits.h for availabel baudrates on your linux system
 FFLAGS_EXTRA += -b 0010005

boards/mega-xplained/Makefile.include

@@ -14,8 +14,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 
 # PROGRAMMER defaults to the external flasher Bus Pirate ISP using avrdude.
 PROGRAMMER  ?= buspirate
-# set mcu model for avrdude
-FFLAGS += -p m1284p
 # set serial port for avrdude with buspirate
 ifeq ($(OS),Linux)
   AVRDUDE_PORT ?= /dev/ttyUSB0

boards/waspmote-pro/Makefile.include

@@ -17,8 +17,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # using avrdude. Can be overridden for debugging (which requires changes
 # that require to use an ISP)
 PROGRAMMER ?= stk500v1
-# set mcu model for avrdude
-FFLAGS += -p m1281
 # configure programmer speed in baud
 FFLAGS_EXTRA += -b 115200
 # avoid error if mcu signature doesn't match

makefiles/tools/avrdude.inc.mk

@@ -6,10 +6,16 @@ DEBUGSERVER_FLAGS = "-g -j usb :$(DEBUGSERVER_PORT)"
 DEBUGGER_FLAGS = "-x $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)"
 DEBUGGER = $(DIST_PATH)/debug.sh $(DEBUGSERVER_FLAGS) $(DIST_PATH) $(DEBUGSERVER_PORT)
 
-# make the flasher port configurable (e.g. with atmelice the port is usb)
-# defaults to terminal's serial port if not configured
-AVRDUDE_PORT    ?= $(PORT)
-PROGRAMMER_FLAGS = -P $(AVRDUDE_PORT) $(FFLAGS_EXTRA)
+PROGRAMMER_FLAGS = -p $(subst atmega,m,$(CPU))
+
+# Set flasher port only for programmers that require it
+ifneq (,$(filter $(PROGRAMMER),arduino buspirate stk500v1 stk500v2 wiring))
+  # make the flasher port configurable (e.g. with atmelice the port is usb)
+  # defaults to terminal's serial port if not configured
+  AVRDUDE_PORT     ?= $(PORT)
+  PROGRAMMER_FLAGS += -P $(AVRDUDE_PORT)
+endif
+PROGRAMMER_FLAGS += $(FFLAGS_EXTRA)
 
 # don't force to flash HEXFILE, but set it as default
 FLASHFILE ?= $(HEXFILE)