From: flabbergast <s3+flabbergast@sdfeu.org>
Date: Sat, 10 Oct 2015 14:20:55 +0000 (+0100)
Subject: Add ARM Teensies bootloader code.
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=19bb28d102b8c9b226aae38e2d8d9e53e574d6ec;p=max%2Ftmk_keyboard.git

Add ARM Teensies bootloader code.
---

diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index f36eced4..cac52209 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -1,8 +1,13 @@
 #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__;
 
@@ -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
    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
\ No newline at end of file
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 589675aa..b2526d14 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -69,9 +69,9 @@ host_driver_t chibios_driver = {
 //   while(true) {
 //     if(blinkLed) {
 //       blinkLed = 0;
-//       palSetPad(GPIOC, GPIOC_LED_ORANGE);
+//       palSetPad(TEENSY_PIN13_IOPORT, TEENSY_PIN13);
 //       chThdSleepMilliseconds(100);
-//       palClearPad(GPIOC, GPIOC_LED_ORANGE);
+//       palClearPad(TEENSY_PIN13_IOPORT, TEENSY_PIN13);
 //     }
 //     chThdSleepMilliseconds(100);
 //   }
@@ -86,10 +86,6 @@ int main(void) {
   halInit();
   chSysInit();
 
-  palSetPad(GPIOC, GPIOC_LED_BLUE);
-  chThdSleepMilliseconds(400);
-  palClearPad(GPIOC, GPIOC_LED_BLUE);
-
   // TESTING
   // chThdCreateStatic(waBlinkerThread, sizeof(waBlinkerThread), NORMALPRIO, blinkerThread, NULL);