diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-10-06 05:09:35 +1100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-10-05 11:09:35 -0700 |
| commit | e8b65d01709c2ebdf50c0aa95963d200fa4fa4c6 (patch) | |
| tree | 1f8c889788cd3958d0583d8a8b9192e3425ba115 /keyboards/dp60 | |
| parent | 19b60c273ab63c250db748e5eead6baba88cd0d8 (diff) | |
| download | qmk_firmware-e8b65d01709c2ebdf50c0aa95963d200fa4fa4c6.tar.gz qmk_firmware-e8b65d01709c2ebdf50c0aa95963d200fa4fa4c6.zip | |
Cleanup rules.mk for 32U4 keyboards, A-F (#6804)
* Cleanup rules.mk for 32U4 keyboards, A-F
* Put back stuff in VIA keymaps
Diffstat (limited to 'keyboards/dp60')
| -rw-r--r-- | keyboards/dp60/keymaps/via/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/dp60/rules.mk | 20 |
2 files changed, 10 insertions, 13 deletions
diff --git a/keyboards/dp60/keymaps/via/rules.mk b/keyboards/dp60/keymaps/via/rules.mk index d532fc455..27d6223ba 100644 --- a/keyboards/dp60/keymaps/via/rules.mk +++ b/keyboards/dp60/keymaps/via/rules.mk | |||
| @@ -11,7 +11,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| 11 | # LUFA bootloader 4096 | 11 | # LUFA bootloader 4096 |
| 12 | # USBaspLoader 2048 | 12 | # USBaspLoader 2048 |
| 13 | BOOTLOADER = atmel-dfu | 13 | BOOTLOADER = atmel-dfu |
| 14 | #OPT_DEFS += -DBOOTLOADER_SIZE=4096 | ||
| 15 | 14 | ||
| 16 | # Do not put the microcontroller into power saving mode | 15 | # Do not put the microcontroller into power saving mode |
| 17 | # when we get USB suspend event. We want it to keep updating | 16 | # when we get USB suspend event. We want it to keep updating |
| @@ -45,4 +44,4 @@ DYNAMIC_KEYMAP_ENABLE = yes | |||
| 45 | 44 | ||
| 46 | CUSTOM_MATRIX = yes | 45 | CUSTOM_MATRIX = yes |
| 47 | SRC += matrix.c keyboards/wilba_tech/wt_main.c | 46 | SRC += matrix.c keyboards/wilba_tech/wt_main.c |
| 48 | #keyboards/stm60/webusb.c \ No newline at end of file | 47 | #keyboards/stm60/webusb.c |
diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 1404ab7b3..0f998746f 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk | |||
| @@ -1,17 +1,15 @@ | |||
| 1 | # MCU name | 1 | # MCU name |
| 2 | MCU = atmega32u4 | 2 | MCU = atmega32u4 |
| 3 | 3 | ||
| 4 | # Interrupt driven control endpoint task(+60) | 4 | # Bootloader selection |
| 5 | OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | 5 | # Teensy halfkay |
| 6 | 6 | # Pro Micro caterina | |
| 7 | # Boot Section Size in *bytes* | 7 | # Atmel DFU atmel-dfu |
| 8 | # Teensy halfKay 512 | 8 | # LUFA DFU lufa-dfu |
| 9 | # Teensy++ halfKay 1024 | 9 | # QMK DFU qmk-dfu |
| 10 | # Atmel DFU loader 4096 | 10 | # ATmega32A bootloadHID |
| 11 | # LUFA bootloader 4096 | 11 | # ATmega328P USBasp |
| 12 | # USBaspLoader 2048 | ||
| 13 | BOOTLOADER = atmel-dfu | 12 | BOOTLOADER = atmel-dfu |
| 14 | #OPT_DEFS += -DBOOTLOADER_SIZE=4096 | ||
| 15 | 13 | ||
| 16 | # Do not put the microcontroller into power saving mode | 14 | # Do not put the microcontroller into power saving mode |
| 17 | # when we get USB suspend event. We want it to keep updating | 15 | # when we get USB suspend event. We want it to keep updating |
| @@ -42,4 +40,4 @@ RGB_MATRIX_ENABLE = yes # Use RGB matrix | |||
| 42 | LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift | 40 | LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift |
| 43 | 41 | ||
| 44 | CUSTOM_MATRIX = yes | 42 | CUSTOM_MATRIX = yes |
| 45 | SRC += matrix.c \ No newline at end of file | 43 | SRC += matrix.c |