Set proper AVR part for USBasp avrdude flashing (#7552)

* Set proper AVR part for USBasp avrdude flashing

* Remove `PROGRAM_CMD` stuff from rules.mk as they should not be needed anymore

* Missed the Plaid readme

* Remove PROGRAM_CMD from Mysterium

diff --git a/keyboards/coseyfannitutti/discipad/rules.mk b/keyboards/coseyfannitutti/discipad/rules.mk
index a9d06d608c433194a7ff9180811d0485a72e315d..52e06f6e762c5ac1c443115fe43385c82cc04c81 100644 (file)
--- a/keyboards/coseyfannitutti/discipad/rules.mk
+++ b/keyboards/coseyfannitutti/discipad/rules.mk
@@ -11,14 +11,9 @@ MCU = atmega328p
 #   ATmega328P   USBasp
 BOOTLOADER = USBasp
 
-# Flash program via avrdude, but default command is not suitable.
-# You can use coseyfannitutti/discipad:default:program
-PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
 # disable debug code
 OPT_DEFS = -DDEBUG_LEVEL=0
 
-
 # Build Options
 #   change yes to no to disable
 #

diff --git a/keyboards/coseyfannitutti/discipline/readme.md b/keyboards/coseyfannitutti/discipline/readme.md
index d850151d152dc508b598760fd174545d0735f1b9..27a1790998d7c52b95e55ababb009b3b00b90101 100644 (file)
--- a/keyboards/coseyfannitutti/discipline/readme.md
+++ b/keyboards/coseyfannitutti/discipline/readme.md
@@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment):
 
     make coseyfannitutti/discipline:default
 
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+Flashing example for this keyboard:
 
     make coseyfannitutti/discipline:default:flash
 

diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk
index 24b5969b74d391a328faa53ab6594518ea0a202d..5666501ef5bfac537448fbda46a02f050ed76582 100644 (file)
--- a/keyboards/coseyfannitutti/discipline/rules.mk
+++ b/keyboards/coseyfannitutti/discipline/rules.mk
@@ -14,10 +14,6 @@ F_CPU = 16000000
 #   ATmega328P   USBasp
 BOOTLOADER = USBasp
 
-# Flash program via avrdude, but default command is not suitable.
-# You can use plaid:default:program
-PROGRAM_CMD = avrdude -c usbasp -p m32 -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
 # disable debug code
 OPT_DEFS = -DDEBUG_LEVEL=0
 

diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk
index 51e1b8ae2fc8d767169191bb942c68a6d88b12ce..4147cfec9652d2a056367ce363e15cf6d388fbd8 100644 (file)
--- a/keyboards/coseyfannitutti/mysterium/rules.mk
+++ b/keyboards/coseyfannitutti/mysterium/rules.mk
@@ -14,10 +14,6 @@ F_USB = 16000000
 #   ATmega328P   USBasp
 BOOTLOADER = USBasp
 
-# Flash program via avrdude, but default command is not suitable.
-# You can use coseyfannitutti/discipline:default:program
-PROGRAM_CMD = avrdude -c usbasp -p m32 -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
 # disable debug code
 OPT_DEFS = -DDEBUG_LEVEL=0
 

diff --git a/keyboards/gingham/readme.md b/keyboards/gingham/readme.md
index 9893884e84e1e34a9e5890d8d1be4714761d1940..d0c3e6fad7915ea6c9edb9975a08eb6592464274 100644 (file)
--- a/keyboards/gingham/readme.md
+++ b/keyboards/gingham/readme.md
@@ -9,11 +9,12 @@ Hardware Supported: ATMEGA328p with vusb [PCB](https://github.com/yiancar/gingha
 Hardware Availability: https://yiancar-designs.com/, https://novelkeys.xyz, https://mechboards.co.uk/  
 
 Make example for this keyboard (after setting up your build environment):
+
     make gingham:default
 
-Flash firmware:
-    // In bootloader mode
-    make gingham:default:program
+Flashing example for this keyboard:
+
+    make gingham:default:flash
 
 Bootloader:
 use usbasploader HSGW's my repository.

diff --git a/keyboards/gingham/rules.mk b/keyboards/gingham/rules.mk
index aa228c875bf5982a3d1f03bbf9f8d39d1fc0ee2a..2ef090bd68376dc846da01adf806417d6dbf4d19 100644 (file)
--- a/keyboards/gingham/rules.mk
+++ b/keyboards/gingham/rules.mk
@@ -14,10 +14,6 @@ MCU = atmega328p
 #   ATmega328P   USBasp
 BOOTLOADER = USBasp
 
-# Flash program via avrdude, but default command is not suitable.
-# You can use plaid:default:program
-PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
 # disable debug code
 OPT_DEFS = -DDEBUG_LEVEL=0
 

diff --git a/keyboards/handwired/hnah40/readme.md b/keyboards/handwired/hnah40/readme.md
index 20e2d712740421f42f2f6952bc73dee4af0efa92..a15800daeee8809c3a5e47dd68e2f779c47afb14 100644 (file)
--- a/keyboards/handwired/hnah40/readme.md
+++ b/keyboards/handwired/hnah40/readme.md
@@ -10,7 +10,11 @@ Hardware Availability: https://github.com/vuhopkep/PCB/tree/master/Hnah40-Atmega
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/hnah40:default:program
+    make handwired/hnah40:default
+
+Flashing example for this keyboard:
+
+    make handwired/hnah40:default:flash
 
 ## Bootloader 
 use usbasploader from hsgw.

diff --git a/keyboards/handwired/hnah40/rules.mk b/keyboards/handwired/hnah40/rules.mk
index bbdf5176c440351aaedd7ae8bdc8e35d3dc5f09b..a705bff6abf51ee352d97f5649bbb4335d62175c 100644 (file)
--- a/keyboards/handwired/hnah40/rules.mk
+++ b/keyboards/handwired/hnah40/rules.mk
@@ -11,15 +11,9 @@ MCU = atmega328p
 #   ATmega328P   USBasp
 BOOTLOADER = USBasp
 
-# Flash program via avrdude, but default command is not suitable.
-# You can use hnah40:default:program
-PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-
 # disable debug code
 OPT_DEFS = -DDEBUG_LEVEL=0
 
-
 # Build Options
 #   change yes to no to disable
 #

diff --git a/keyboards/plaid/readme.md b/keyboards/plaid/readme.md
index dd49ecbdf53c3d10b82468bd825a39e6fe4e27b2..a491d05d3bf21efae93b1639464e461443cbbc00 100644 (file)
--- a/keyboards/plaid/readme.md
+++ b/keyboards/plaid/readme.md
@@ -11,9 +11,9 @@ Hardware Availability: Group buy in r/mk
 Make example for this keyboard (after setting up your build environment):
     make plaid:default
 
-Flash firmware:
-    // In bootloader mode
-    make plaid:default:program
+Flashing example for this keyboard:
+
+    make plaid:default:flash
 
 ## Bootloader
 use usbasploader in my repository.

diff --git a/keyboards/plaid/rules.mk b/keyboards/plaid/rules.mk
index 5ac35ee7f35ae4636289de86161a8d527fba726e..e020114b3340f90f82528a23134401d374c1a237 100644 (file)
--- a/keyboards/plaid/rules.mk
+++ b/keyboards/plaid/rules.mk
@@ -11,15 +11,9 @@ MCU = atmega328p
 #   ATmega328P   USBasp
 BOOTLOADER = USBasp
 
-# Flash program via avrdude, but default command is not suitable.
-# You can use plaid:default:program
-PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-
 # disable debug code
 OPT_DEFS = -DDEBUG_LEVEL=0
 
-
 # Build Options
 #   change yes to no to disable
 #

diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk
index f2c341e69b3c666f96aa18c40cb5c3809ab96d03..24b2b2abd911a485ee449640fa2f227161a74204 100644 (file)
--- a/quantum/mcu_selection.mk
+++ b/quantum/mcu_selection.mk
@@ -75,6 +75,9 @@ ifneq (,$(filter $(MCU),atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 a
 endif
 
 ifneq (,$(filter $(MCU),atmega32a))
+  # MCU name for avrdude
+  AVRDUDE_MCU = m32
+
   PROTOCOL = VUSB
 
   # Processor frequency.
@@ -90,6 +93,9 @@ ifneq (,$(filter $(MCU),atmega32a))
 endif
 
 ifneq (,$(filter $(MCU),atmega328p))
+  # MCU name for avrdude
+  AVRDUDE_MCU = m328p
+
   PROTOCOL = VUSB
 
   # Processor frequency.

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 8207394d74b6c5302fe36482255fc9ba53854a2e..ecd2fd39a484e43719787ec06ec4edadb3f41bd0 100644 (file)
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -240,7 +240,7 @@ avrdude-split-right: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
        $(call EXEC_AVRDUDE,eeprom-righthand.eep)
 
 define EXEC_USBASP
-       avrdude -p $(MCU) -c usbasp -U flash:w:$(BUILD_DIR)/$(TARGET).hex
+       avrdude -p $(AVRDUDE_MCU) -c usbasp -U flash:w:$(BUILD_DIR)/$(TARGET).hex
 endef
 
 usbasp: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware