diff options
| author | Chris Dosé <chris.dose@gmail.com> | 2019-06-02 13:34:17 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-06-03 12:11:03 -0700 |
| commit | 7ddf3c28f46f8582c897ad118c28734cd9332841 (patch) | |
| tree | f7fc593ac86ce1e1401e6b15772c864cf6524af1 /tmk_core | |
| parent | a678f4a206f88cb2dc99be260da4d5030b1adeaa (diff) | |
| download | qmk_firmware-7ddf3c28f46f8582c897ad118c28734cd9332841.tar.gz qmk_firmware-7ddf3c28f46f8582c897ad118c28734cd9332841.zip | |
Fixes compile errors for massdrop keyboards
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/arm_atsam/md_bootloader.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tmk_core/protocol/arm_atsam/md_bootloader.h b/tmk_core/protocol/arm_atsam/md_bootloader.h index 956145c31..6b80ef492 100644 --- a/tmk_core/protocol/arm_atsam/md_bootloader.h +++ b/tmk_core/protocol/arm_atsam/md_bootloader.h | |||
| @@ -11,7 +11,7 @@ extern uint32_t _erom; | |||
| 11 | //WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support | 11 | //WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support |
| 12 | extern uint32_t _eram; | 12 | extern uint32_t _eram; |
| 13 | #define BOOTLOADER_MAGIC 0x3B9ACA00 | 13 | #define BOOTLOADER_MAGIC 0x3B9ACA00 |
| 14 | #define MAGIC_ADDR (uint32_t *)(&_eram - 4) | 14 | #define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4) |
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | #ifdef MD_BOOTLOADER | 17 | #ifdef MD_BOOTLOADER |
| @@ -22,4 +22,3 @@ extern uint32_t _eram; | |||
| 22 | #endif //MD_BOOTLOADER | 22 | #endif //MD_BOOTLOADER |
| 23 | 23 | ||
| 24 | #endif //_MD_BOOTLOADER_H_ | 24 | #endif //_MD_BOOTLOADER_H_ |
| 25 | |||