diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-09-10 17:36:17 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-09-10 17:36:17 +1000 |
| commit | a7c972b329d908d2bec683f83d9841bcbd0d6175 (patch) | |
| tree | 2aa606d68664780e0320db60bc4b18f8ddc77bd9 /docs/flashing.md | |
| parent | c94cc1effaf0a71f62f5498b3437f22c96f18f74 (diff) | |
| parent | d5cb7de5e4ea60dce69764a627358d534af1f666 (diff) | |
| download | qmk_firmware-a7c972b329d908d2bec683f83d9841bcbd0d6175.tar.gz qmk_firmware-a7c972b329d908d2bec683f83d9841bcbd0d6175.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'docs/flashing.md')
| -rw-r--r-- | docs/flashing.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/flashing.md b/docs/flashing.md index 7b7fe956f..2e69f246a 100644 --- a/docs/flashing.md +++ b/docs/flashing.md | |||
| @@ -127,7 +127,7 @@ To ensure compatibility with the USBasploader bootloader, make sure this block i | |||
| 127 | 127 | ||
| 128 | ```make | 128 | ```make |
| 129 | # Bootloader selection | 129 | # Bootloader selection |
| 130 | BOOTLOADER = USBasp | 130 | BOOTLOADER = usbasploader |
| 131 | ``` | 131 | ``` |
| 132 | 132 | ||
| 133 | Compatible flashers: | 133 | Compatible flashers: |
| @@ -153,13 +153,13 @@ To ensure compatibility with the bootloadHID bootloader, make sure this block is | |||
| 153 | 153 | ||
| 154 | ```make | 154 | ```make |
| 155 | # Bootloader selection | 155 | # Bootloader selection |
| 156 | BOOTLOADER = bootloadHID | 156 | BOOTLOADER = bootloadhid |
| 157 | ``` | 157 | ``` |
| 158 | 158 | ||
| 159 | Compatible flashers: | 159 | Compatible flashers: |
| 160 | 160 | ||
| 161 | * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI) | 161 | * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI) |
| 162 | * [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadHID` target in QMK (recommended command line) | 162 | * [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadhid` target in QMK (recommended command line) |
| 163 | * [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash) | 163 | * [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash) |
| 164 | 164 | ||
| 165 | Flashing sequence: | 165 | Flashing sequence: |