diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2016-09-29 22:59:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 22:59:31 +0200 |
| commit | eb0f21a984eff2a8c4ad15f91fb18b456373e921 (patch) | |
| tree | 054ee42af8683f22b3f0ddf36a43d8c33d713454 /tmk_core/common/avr/bootloader.c | |
| parent | f0441f08b87986f49479f1503b11a3d3f899d58e (diff) | |
| parent | f0db230c461b77d0d24984d4f0dcd26f12e67076 (diff) | |
| download | qmk_firmware-eb0f21a984eff2a8c4ad15f91fb18b456373e921.tar.gz qmk_firmware-eb0f21a984eff2a8c4ad15f91fb18b456373e921.zip | |
Merge pull request #6 from jackhumbert/master
Merge from jackhumbert
Diffstat (limited to 'tmk_core/common/avr/bootloader.c')
| -rw-r--r-- | tmk_core/common/avr/bootloader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index fb9bf2d1c..ad547b985 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | * | | | | | 38 | * | | | | |
| 39 | * = = = = | 39 | * = = = = |
| 40 | * | | 32KB-4KB | | 128KB-8KB | 40 | * | | 32KB-4KB | | 128KB-8KB |
| 41 | * 0x6000 +---------------+ 0x1FC00 +---------------+ | 41 | * 0x7000 +---------------+ 0x1E000 +---------------+ |
| 42 | * | Bootloader | 4KB | Bootloader | 8KB | 42 | * | Bootloader | 4KB | Bootloader | 8KB |
| 43 | * 0x7FFF +---------------+ 0x1FFFF +---------------+ | 43 | * 0x7FFF +---------------+ 0x1FFFF +---------------+ |
| 44 | * | 44 | * |
| @@ -64,8 +64,8 @@ | |||
| 64 | #define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE) | 64 | #define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE) |
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | /* | 67 | /* |
| 68 | * Entering the Bootloader via Software | 68 | * Entering the Bootloader via Software |
| 69 | * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html | 69 | * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html |
| 70 | */ | 70 | */ |
| 71 | #define BOOTLOADER_RESET_KEY 0xB007B007 | 71 | #define BOOTLOADER_RESET_KEY 0xB007B007 |
| @@ -137,7 +137,7 @@ void bootloader_jump_after_watchdog_reset(void) | |||
| 137 | #if 0 | 137 | #if 0 |
| 138 | /* Jumping To The Bootloader | 138 | /* Jumping To The Bootloader |
| 139 | * http://www.pjrc.com/teensy/jump_to_bootloader.html | 139 | * http://www.pjrc.com/teensy/jump_to_bootloader.html |
| 140 | * | 140 | * |
| 141 | * This method doen't work when using LUFA. idk why. | 141 | * This method doen't work when using LUFA. idk why. |
| 142 | * - needs to initialize more regisers or interrupt setting? | 142 | * - needs to initialize more regisers or interrupt setting? |
| 143 | */ | 143 | */ |