summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2018-02-10 23:09:03 +0200
committerJack Humbert <jack.humb@gmail.com>2018-02-10 17:13:38 -0500
commit8c2ae4a4701439e98569dc2f2acee7016b4c0f20 (patch)
tree835e57a8f18b7a8259f24bbd5d8a3c784e843688
parentfca31693df15f62cc3fd5851a0d1bae40eb179c2 (diff)
Fix reset for STM32 devices
-rw-r--r--keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c4
-rw-r--r--keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h4
-rw-r--r--keyboards/clueboard/60/rules.mk2
-rw-r--r--tmk_core/common/chibios/bootloader.c34
4 files changed, 23 insertions, 21 deletions
diff --git a/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
index 897f20a887..4331155df4 100644
--- a/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
+++ b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
@@ -62,13 +62,15 @@ const PALConfig pal_default_config = {
};
#endif
+void enter_bootloader_mode_if_requested(void);
+
/**
* @brief Early initialization code.
* @details This initialization must be performed just after stack setup
* and before any other initialization.
*/
void __early_init(void) {
-
+ enter_bootloader_mode_if_requested();
stm32_clock_init();
}
diff --git a/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
index 7405c0ea90..e09112eb98 100644
--- a/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
+++ b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
@@ -1164,14 +1164,14 @@
/*
* USB bus activation macro, required by the USB driver.
*/
-// #define usb_lld_connect_bus(usbp)
+// #define usb_lld_connect_bus(usbp)
#define usb_lld_connect_bus(usbp) (palSetPadMode(GPIOA, GPIOA_USB_DP, PAL_MODE_ALTERNATE(14)))
// #define usb_lld_connect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_INPUT)
/*
* USB bus de-activation macro, required by the USB driver.
*/
// #define usb_lld_disconnect_bus(usbp)
-#define usb_lld_disconnect_bus(usbp) (palSetPadMode(GPIOA, GPIOA_USB_DP, PAL_MODE_OUTPUT_PUSHPULL))
+#define usb_lld_disconnect_bus(usbp) (palSetPadMode(GPIOA, GPIOA_USB_DP, PAL_MODE_OUTPUT_PUSHPULL)); palClearPad(GPIOA, GPIOA_USB_DP)
// #define usb_lld_disconnect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_OUTPUT_PUSHPULL); palClearPad(GPIOA, 12)
#if !defined(_FROM_ASM_)
diff --git a/keyboards/clueboard/60/rules.mk b/keyboards/clueboard/60/rules.mk
index e0c4b85027..3664b6d2c1 100644
--- a/keyboards/clueboard/60/rules.mk
+++ b/keyboards/clueboard/60/rules.mk
@@ -37,7 +37,7 @@ USE_FPU = yes
OPT_DEFS =
# Options to pass to dfu-util when flashing
-DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000 -R
+DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
# Build Options
# comment out to disable the options.
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index fc17fca1b6..2dd3ade34e 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -6,32 +6,32 @@
#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__;
+#define BOOTLOADER_MAGIC 0xDEADBEEF
+#define MAGIC_ADDR (unsigned long*)(SYMVAL(__ram0_end__) - 4)
-void bootloader_jump(void) {
- *((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader
- NVIC_SystemReset();
-}
-
-#elif defined(STM32F3XX)
-/* This code should be checked whether it runs correctly on platforms.
- * It was added for clueboard60 BUT HAS NOT BEEN TESTED.
- * FIXME - Test this
- */
-#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
+ *MAGIC_ADDR = BOOTLOADER_MAGIC; // 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) */
+void enter_bootloader_mode_if_requested(void) {
+ unsigned long* check = MAGIC_ADDR;
+ if(*check == BOOTLOADER_MAGIC) {
+ *check = 0;
+ __set_CONTROL(0);
+ __set_MSP(*(__IO uint32_t*)STM32_BOOTLOADER_ADDRESS);
+ __enable_irq();
+
+ typedef void (*BootJump_t)(void);
+ BootJump_t boot_jump = *(BootJump_t*)(STM32_BOOTLOADER_ADDRESS + 4);
+ boot_jump();
+ while(1);
+ }
+ }
#elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
/* Kinetis */