g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
fauxpark 2019-12-08 18:32:43 +11:00 committed by Drashna Jaelre
parent a7209533a3
commit c74295de88
12 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/coseyfannitutti/discipad/rules.mk
View File

@ -11,14 +11,9 @@ MCU = atmega328p
# ATmega328P USBasp # ATmega328P USBasp
BOOTLOADER = 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 # disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS = -DDEBUG_LEVEL=0
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

2
keyboards/coseyfannitutti/discipline/readme.md
View File

@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment):
make coseyfannitutti/discipline:default 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 make coseyfannitutti/discipline:default:flash

4
keyboards/coseyfannitutti/discipline/rules.mk
View File

@ -14,10 +14,6 @@ F_CPU = 16000000
# ATmega328P USBasp # ATmega328P USBasp
BOOTLOADER = 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 # disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS = -DDEBUG_LEVEL=0

4
keyboards/coseyfannitutti/mysterium/rules.mk
View File

@ -14,10 +14,6 @@ F_USB = 16000000
# ATmega328P USBasp # ATmega328P USBasp
BOOTLOADER = 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 # disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS = -DDEBUG_LEVEL=0

7
keyboards/gingham/readme.md
View File

@ -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/ 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 example for this keyboard (after setting up your build environment):
make gingham:default make gingham:default
Flash firmware: Flashing example for this keyboard:
// In bootloader mode
make gingham:default:program make gingham:default:flash
Bootloader: Bootloader:
use usbasploader HSGW's my repository. use usbasploader HSGW's my repository.

4
keyboards/gingham/rules.mk
View File

@ -14,10 +14,6 @@ MCU = atmega328p
# ATmega328P USBasp # ATmega328P USBasp
BOOTLOADER = 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 # disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS = -DDEBUG_LEVEL=0

6
keyboards/handwired/hnah40/readme.md
View File

@ -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 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 ## Bootloader
use usbasploader from hsgw. use usbasploader from hsgw.

6
keyboards/handwired/hnah40/rules.mk
View File

@ -11,15 +11,9 @@ MCU = atmega328p
# ATmega328P USBasp # ATmega328P USBasp
BOOTLOADER = 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 # disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS = -DDEBUG_LEVEL=0
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

6
keyboards/plaid/readme.md
View File

@ -11,9 +11,9 @@ Hardware Availability: Group buy in r/mk
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make plaid:default make plaid:default
Flash firmware: Flashing example for this keyboard:
// In bootloader mode
make plaid:default:program make plaid:default:flash
## Bootloader ## Bootloader
use usbasploader in my repository. use usbasploader in my repository.

6
keyboards/plaid/rules.mk
View File

@ -11,15 +11,9 @@ MCU = atmega328p
# ATmega328P USBasp # ATmega328P USBasp
BOOTLOADER = 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 # disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0 OPT_DEFS = -DDEBUG_LEVEL=0
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

6
quantum/mcu_selection.mk
View File

@ -75,6 +75,9 @@ ifneq (,$(filter $(MCU),atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 a
endif endif
ifneq (,$(filter $(MCU),atmega32a)) ifneq (,$(filter $(MCU),atmega32a))
# MCU name for avrdude
AVRDUDE_MCU = m32
PROTOCOL = VUSB PROTOCOL = VUSB
# Processor frequency. # Processor frequency.
@ -90,6 +93,9 @@ ifneq (,$(filter $(MCU),atmega32a))
endif endif
ifneq (,$(filter $(MCU),atmega328p)) ifneq (,$(filter $(MCU),atmega328p))
# MCU name for avrdude
AVRDUDE_MCU = m328p
PROTOCOL = VUSB PROTOCOL = VUSB
# Processor frequency. # Processor frequency.

2
tmk_core/avr.mk
View File

@ -240,7 +240,7 @@ avrdude-split-right: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
$(call EXEC_AVRDUDE,eeprom-righthand.eep) $(call EXEC_AVRDUDE,eeprom-righthand.eep)
define EXEC_USBASP 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 endef
usbasp: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware usbasp: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware