1 files changed, 2 insertions, 27 deletions
diff --git a/src/stm32/stm32l4.c b/src/stm32/stm32l4.c
index b5c939bb..709473c8 100644
--- a/src/stm32/stm32l4.c
+++ b/src/stm32/stm32l4.c
@@ -139,36 +139,11 @@ clock_setup(void)
  * Bootloader
  ****************************************************************/
 
-#define USB_BOOT_FLAG_ADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - 4096)
-#define USB_BOOT_FLAG 0x55534220424f4f54 // "USB BOOT"
-
-// Flag that bootloader is desired and reboot
-static void
-usb_reboot_for_dfu_bootloader(void)
-{
-    irq_disable();
-    // System DFU Bootloader
-    *(uint64_t*)USB_BOOT_FLAG_ADDR = USB_BOOT_FLAG;
-    NVIC_SystemReset();
-}
-
-// Check if rebooting into system DFU Bootloader
-static void
-check_usb_dfu_bootloader(void)
-{
-    if (!CONFIG_USB || *(uint64_t*)USB_BOOT_FLAG_ADDR != USB_BOOT_FLAG)
-        return;
-    *(uint64_t*)USB_BOOT_FLAG_ADDR = 0;
-    uint32_t *sysbase = (uint32_t*)0x1fff0000;
-    asm volatile("mov sp, %0\n bx %1"
-                 : : "r"(sysbase[0]), "r"(sysbase[1]));
-}
-
 // Handle USB reboot requests
 void
 bootloader_request(void)
 {
-    usb_reboot_for_dfu_bootloader();
+    dfu_reboot();
 }
 
 
@@ -180,7 +155,7 @@ bootloader_request(void)
 void
 armcm_main(void)
 {
-    check_usb_dfu_bootloader();
+    dfu_reboot_check();
 
     // Run SystemInit() and then restore VTOR
     SystemInit();