summaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorChris Dosé <chris.dose@gmail.com>2019-06-02 13:34:17 -0700
committerDrashna Jaelre <drashna@live.com>2019-06-03 12:11:03 -0700
commit7ddf3c28f46f8582c897ad118c28734cd9332841 (patch)
treef7fc593ac86ce1e1401e6b15772c864cf6524af1 /tmk_core/protocol
parenta678f4a206f88cb2dc99be260da4d5030b1adeaa (diff)
downloadqmk_firmware-7ddf3c28f46f8582c897ad118c28734cd9332841.tar.gz
qmk_firmware-7ddf3c28f46f8582c897ad118c28734cd9332841.zip
Fixes compile errors for massdrop keyboards
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/arm_atsam/md_bootloader.h3
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 956145c313..6b80ef4922 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;
//WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
extern uint32_t _eram;
#define BOOTLOADER_MAGIC 0x3B9ACA00
-#define MAGIC_ADDR (uint32_t *)(&_eram - 4)
+#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
#endif
#ifdef MD_BOOTLOADER
@@ -22,4 +22,3 @@ extern uint32_t _eram;
#endif //MD_BOOTLOADER
#endif //_MD_BOOTLOADER_H_
-