diff options
| -rwxr-xr-x | scripts/flash_usb.py | 3 | ||||
| -rw-r--r-- | src/stm32/Makefile | 1 | ||||
| -rw-r--r-- | src/stm32/stm32f0.c | 15 |
3 files changed, 18 insertions, 1 deletions
diff --git a/scripts/flash_usb.py b/scripts/flash_usb.py index bb1afcce..a40708ba 100755 --- a/scripts/flash_usb.py +++ b/scripts/flash_usb.py @@ -211,7 +211,8 @@ def flash_stm32f4(options, binfile): MCUTYPES = { 'atsam3': flash_atsam3, 'atsam4': flash_atsam4, 'atsamd': flash_atsamd, - 'lpc176x': flash_lpc176x, 'stm32f1': flash_stm32f1, 'stm32f4': flash_stm32f4 + 'lpc176x': flash_lpc176x, 'stm32f1': flash_stm32f1, + 'stm32f4': flash_stm32f4, 'stm32f0': flash_stm32f4, } diff --git a/src/stm32/Makefile b/src/stm32/Makefile index 3ff257a7..5d5a8408 100644 --- a/src/stm32/Makefile +++ b/src/stm32/Makefile @@ -49,6 +49,7 @@ $(OUT)klipper.bin: $(OUT)klipper.elf $(Q)$(OBJCOPY) -O binary $< $@ # Flash rules +FLASH_TYPE-$(CONFIG_MACH_STM32F0) := stm32f0 FLASH_TYPE-$(CONFIG_MACH_STM32F1) := stm32f1 FLASH_TYPE-$(CONFIG_MACH_STM32F4) := stm32f4 diff --git a/src/stm32/stm32f0.c b/src/stm32/stm32f0.c index 8f1361a3..26a3512c 100644 --- a/src/stm32/stm32f0.c +++ b/src/stm32/stm32f0.c @@ -6,6 +6,7 @@ #include "autoconf.h" // CONFIG_CLOCK_REF_8M #include "board/armcm_boot.h" // armcm_main +#include "board/irq.h" // irq_disable #include "command.h" // DECL_CONSTANT_STR #include "internal.h" // enable_pclock #include "sched.h" // sched_main @@ -86,10 +87,16 @@ gpio_peripheral(uint32_t gpio, uint32_t mode, int pullup) regs->OSPEEDR = (regs->OSPEEDR & ~m_msk) | (0x02 << m_shift); } +#define USB_BOOT_FLAG_ADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - 1024) +#define USB_BOOT_FLAG 0x55534220424f4f54 // "USB BOOT" + // Handle USB reboot requests void usb_request_bootloader(void) { + irq_disable(); + *(uint64_t*)USB_BOOT_FLAG_ADDR = USB_BOOT_FLAG; + NVIC_SystemReset(); } #if CONFIG_CLOCK_REF_8M @@ -153,6 +160,14 @@ hsi48_setup(void) void armcm_main(void) { + if (CONFIG_USBSERIAL && CONFIG_MACH_STM32F042 + && *(uint64_t*)USB_BOOT_FLAG_ADDR == USB_BOOT_FLAG) { + *(uint64_t*)USB_BOOT_FLAG_ADDR = 0; + uint32_t *sysbase = (uint32_t*)0x1fffc400; + asm volatile("mov sp, %0\n bx %1" + : : "r"(sysbase[0]), "r"(sysbase[1])); + } + SystemInit(); // Set flash latency |