diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2019-04-23 11:06:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 11:06:56 +0900 |
| commit | f93b7b53b7c46e6a8e4ea5e65659e407c372ca8c (patch) | |
| tree | afa9ad87406f7b267875553f2b6a695caf163dce | |
| parent | 7ca465911dda885b0ecba11c0757134f36085de6 (diff) | |
| parent | 2d95c30c28f96c3f746479ddb04ace20e0724e7f (diff) | |
Merge pull request #23 from zsa/fix/avr_gcc_compiler
Fix AVR GCC 8.x compiler error
| -rw-r--r-- | changelog.md | 1 | ||||
| -rw-r--r-- | tmk_core/common/avr/bootloader.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md index e10ef915d7..6501f03f35 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ 04-16-2019 - Fix info.json for Ergodox EZ 04-16-2019 - Add support for WS2812 based RGB Matrix 04-18-2019 - Fix Eager Per Row Debouncing bug +04-22-2019 - Make sure NOBITS is set on reset_key 04-22-2019 - Improve Mousekey constant speed mode 04-22-2019 - Add new reactive modes (wide, cross, nexus) for RGB Matrix 04-22-2019 - OLED Driver Features diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index c4b913280e..3cdcd2e426 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c @@ -70,7 +70,7 @@ * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html */ #define BOOTLOADER_RESET_KEY 0xB007B007 -uint32_t reset_key __attribute__ ((section (".noinit"))); +uint32_t reset_key __attribute__ ((section (".noinit,\"aw\",@nobits;"))); /** \brief initialize MCU status by watchdog reset * |