Skip to content

Commit

Permalink
Cleanup rules.mk for 32A and 328P keyboards (qmk#6767)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored and drashna committed Sep 21, 2019
1 parent fa40485 commit 07a365c
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 33 deletions.
80 changes: 55 additions & 25 deletions docs/flashing.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,17 @@ Atmel's DFU bootloader comes on all atmega32u4 chips by default, and is used by

To ensure compatibility with the DFU bootloader, make sure this block is present your `rules.mk` (optionally with `lufa-dfu` or `qmk-dfu` instead):

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = atmel-dfu
```make
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = atmel-dfu
```

Compatible flashers:

Expand Down Expand Up @@ -64,11 +70,17 @@ Arduino boards and their clones use the [Caterina bootloader](https://github.com

To ensure compatibility with the Caterina bootloader, make sure this block is present your `rules.mk`:

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = caterina
```make
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = caterina
```

Compatible flashers:

Expand Down Expand Up @@ -100,11 +112,17 @@ Halfkay is a super-slim protocol developed by PJRC that uses HID, and come on al

To ensure compatibility with the Halfkay bootloader, make sure this block is present your `rules.mk`:

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = halfkay
```make
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = halfkay
```

Compatible flashers:

Expand All @@ -125,11 +143,17 @@ USBasploader is a bootloader developed by matrixstorm. It is used in some non-US

To ensure compatibility with the USBasploader bootloader, make sure this block is present in your `rules.mk`:

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = USBasp
```make
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = USBasp
```

Compatible flashers:

Expand All @@ -150,11 +174,17 @@ BootloadHID is a USB bootloader for AVR microcontrollers. The uploader tool requ

To ensure compatibility with the bootloadHID bootloader, make sure this block is present your `rules.mk`:

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = bootloadHID
```make
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = bootloadHID
```

Compatible flashers:

Expand Down
6 changes: 2 additions & 4 deletions quantum/template/avr/rules.mk
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# MCU name
MCU = atmega32u4


# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# atmega32a bootloadHID
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = atmel-dfu


# If you don't know the bootloader type, then you can specify the
# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
# Teensy halfKay 512
Expand All @@ -21,7 +20,6 @@ BOOTLOADER = atmel-dfu
# USBaspLoader 2048
# OPT_DEFS += -DBOOTLOADER_SIZE=4096


# Build Options
# change yes to no to disable
#
Expand Down
12 changes: 8 additions & 4 deletions quantum/template/ps2avrgb/rules.mk
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# MCU name
MCU = atmega32a

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = bootloadHID

# build options
Expand Down

0 comments on commit 07a365c

Please sign in to comment.