|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
#include "ch.h"
|
|
|
#include "hal.h"
|
|
|
+#include "wait.h"
|
|
|
|
|
|
|
|
|
#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
|
|
@@ -31,45 +32,28 @@
|
|
|
|
|
|
extern uint32_t __ram0_end__;
|
|
|
|
|
|
-# define bootdelay(loopcount) \
|
|
|
- do { \
|
|
|
- for (int i = 0; i < loopcount; ++i) { \
|
|
|
- __asm__ volatile("nop\n\t" \
|
|
|
- "nop\n\t" \
|
|
|
- "nop\n\t"); \
|
|
|
- } \
|
|
|
- } while (0)
|
|
|
-
|
|
|
void bootloader_jump(void) {
|
|
|
- *MAGIC_ADDR = BOOTLOADER_MAGIC;
|
|
|
- NVIC_SystemReset();
|
|
|
-}
|
|
|
-
|
|
|
-void enter_bootloader_mode_if_requested(void) {
|
|
|
- unsigned long *check = MAGIC_ADDR;
|
|
|
- if (*check == BOOTLOADER_MAGIC) {
|
|
|
- *check = 0;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- palSetPadMode(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_MODE_OUTPUT_PUSHPULL);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ palSetPadMode(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_MODE_OUTPUT_PUSHPULL);
|
|
|
# if STM32_BOOTLOADER_DUAL_BANK_POLARITY
|
|
|
- palSetPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
|
|
|
+ palSetPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
|
|
|
# else
|
|
|
- palClearPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
|
|
|
+ palClearPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
|
|
|
# endif
|
|
|
|
|
|
-
|
|
|
- bootdelay(STM32_BOOTLOADER_DUAL_BANK_DELAY);
|
|
|
+
|
|
|
+ wait_ms(100);
|
|
|
|
|
|
-
|
|
|
- NVIC_SystemReset();
|
|
|
- }
|
|
|
+
|
|
|
+ NVIC_SystemReset();
|
|
|
}
|
|
|
|
|
|
+void enter_bootloader_mode_if_requested(void) {}
|
|
|
+
|
|
|
#elif defined(STM32_BOOTLOADER_ADDRESS)
|
|
|
|
|
|
extern uint32_t __ram0_end__;
|