di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

Add ARM Teensies bootloader code.

Browse Source
This commit is contained in:
flabbergast 2015-10-10 15:20:55 +01:00
parent 88c053f78e
commit 19bb28d102
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tmk_core/common/chibios/bootloader.c
View File

@ -1,8 +1,13 @@
#include "bootloader.h" #include "bootloader.h"
#include "ch.h" #include "ch.h"
#include "hal.h"
#ifdef STM32_BOOTLOADER_ADDRESS #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)) #define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
extern uint32_t __ram0_end__; extern uint32_t __ram0_end__;
@ -10,7 +15,19 @@ void bootloader_jump(void) {
*((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader *((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader
NVIC_SystemReset(); NVIC_SystemReset();
} }
#else /* STM32_BOOTLOADER_ADDRESS */
void bootloader_jump(void) {}
#endif /* STM32_BOOTLOADER_ADDRESS */
#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 */
void bootloader_jump(void) {
chThdSleepMilliseconds(100);
__BKPT(0);
}
#else /* neither STM32 nor KINETIS */
void bootloader_jump(void) {}
#endif

8
tmk_core/protocol/chibios/main.c
View File

@ -69,9 +69,9 @@ host_driver_t chibios_driver = {
// while(true) { // while(true) {
// if(blinkLed) { // if(blinkLed) {
// blinkLed = 0; // blinkLed = 0;
// palSetPad(GPIOC, GPIOC_LED_ORANGE); // palSetPad(TEENSY_PIN13_IOPORT, TEENSY_PIN13);
// chThdSleepMilliseconds(100); // chThdSleepMilliseconds(100);
// palClearPad(GPIOC, GPIOC_LED_ORANGE); // palClearPad(TEENSY_PIN13_IOPORT, TEENSY_PIN13);
// } // }
// chThdSleepMilliseconds(100); // chThdSleepMilliseconds(100);
// } // }
@ -86,10 +86,6 @@ int main(void) {
halInit(); halInit();
chSysInit(); chSysInit();
palSetPad(GPIOC, GPIOC_LED_BLUE);
chThdSleepMilliseconds(400);
palClearPad(GPIOC, GPIOC_LED_BLUE);
// TESTING // TESTING
// chThdCreateStatic(waBlinkerThread, sizeof(waBlinkerThread), NORMALPRIO, blinkerThread, NULL); // chThdCreateStatic(waBlinkerThread, sizeof(waBlinkerThread), NORMALPRIO, blinkerThread, NULL);