71381457fa
d5c5ac6 Merge branch 'develop' 5957682 Merge branch 'hotfix-mediakey' a478c62 Merge branch 'hotfix-vusb' cccebfe Merge branch 'njbair-docfix' 0aaab57 Clean up wording in keymap example dc8bbc3 Clarify layer precedence 9e0b4c1 clarify layer documentation 915eb48 core: Fix media/consumer keys 88f90f3 Fix for VUSB configuration 3e290cd Fix including board.mk in chibios.mk 32c69e0 Merge branch 'newapi' into develop c9a56f9 Merge remote-tracking branch 'flabbergast/chibios' into develop 01e33ea Fix chibios and mbed common.mk for hook.c bea79d9 hook: Change func name of usb events 3e97536 hook: Change file and func names(*_hook -> hook_*) c286d8c Merge pull request #10 from fredizzimo/chibios-contrib2 062d74e Update ChibiOS instructions d47150f Add support for new version of ChibiOS and Contrib 62b5401 Chibios: disable LTO (link-time optimisation). c64e9aa hooks: Fix for LUFA 54e68b0 hooks: Remove led_restore_hook 325c09d Chibios: make the default bootloader_jump redefinable (weak). 078c722 Chibios: fix STM32_BOOTLOADER_ADDRESS name. e73cfe5 hooks: Fix for keyboard LED update e6120c5 Implement basic hooks. 7c370e9 Chibios: Update the main chibios README. 7f0198d Chibios: implement sleep LED for STM32. afef9b4 Fix hard-coded path of CHIBIOS 95c5b19 Merge pull request #7 from fredizzimo/sysvsize 27128a8 Sysv format for ChibiOS arm-none-eabi-size d4b8e68 core: Fix chibios user compile options b85d462 Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergast_chibios de41aa1 core: Fix ps2_mouse.c debug print d79d925 Removed duplicate debug message code and surrounded it with IFDEF as needed 8f28589 Chibios: Revert common.mk change (fix AVR linking problem). ec9eff2 Chibios: cleanup usb_main code. 28c4665 Chibios: Fix a HardFault bug (wait after start). git-subtree-dir: tmk_core git-subtree-split: d5c5ac63e60dfc6da6661a21bd968b4d577a27d5
47 lines
1.4 KiB
C
47 lines
1.4 KiB
C
#include "bootloader.h"
|
|
|
|
#include "ch.h"
|
|
#include "hal.h"
|
|
|
|
#ifdef STM32_BOOTLOADER_ADDRESS
|
|
/* STM32 */
|
|
|
|
#if defined(STM32F0XX)
|
|
/* This code should be checked whether it runs correctly on platforms */
|
|
#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
|
|
extern uint32_t __ram0_end__;
|
|
|
|
void bootloader_jump(void) {
|
|
*((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader
|
|
NVIC_SystemReset();
|
|
}
|
|
|
|
#else /* defined(STM32F0XX) */
|
|
#error Check that the bootloader code works on your platform and add it to bootloader.c!
|
|
#endif /* defined(STM32F0XX) */
|
|
|
|
#elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
|
|
/* Kinetis */
|
|
|
|
#if defined(KIIBOHD_BOOTLOADER)
|
|
/* Kiibohd Bootloader (MCHCK and Infinity KB) */
|
|
#define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
|
|
const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff";
|
|
void bootloader_jump(void) {
|
|
__builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
|
|
// request reset
|
|
SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
|
|
}
|
|
|
|
#else /* defined(KIIBOHD_BOOTLOADER) */
|
|
/* Default for Kinetis - expecting an ARM Teensy */
|
|
void bootloader_jump(void) {
|
|
chThdSleepMilliseconds(100);
|
|
__BKPT(0);
|
|
}
|
|
#endif /* defined(KIIBOHD_BOOTLOADER) */
|
|
|
|
#else /* neither STM32 nor KINETIS */
|
|
__attribute__((weak))
|
|
void bootloader_jump(void) {}
|
|
#endif |