From b61f91f49107c34d3c71231be60f3372c648e597 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Sat, 23 Apr 2022 18:21:15 -0400
Subject: [PATCH] deprecate some makefile parameters; fix some timing in
 IOSTM.cpp for USB;

---
 IOSTM.cpp        |  2 ++
 Makefile.STM32FX | 32 --------------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/IOSTM.cpp b/IOSTM.cpp
index 033682e..60a6e31 100644
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@@ -570,9 +570,11 @@ void IO::initInt()
     for (delay = 0; delay < 512; delay++);
 #endif
 
+#if !defined(STM32_USB_HOST)
     GPIO_InitStruct.GPIO_Pin = GPIO_Pin_11 | GPIO_Pin_12;
     GPIO_InitStruct.GPIO_Mode = GPIO_Mode_IN_FLOATING;
     GPIO_Init(GPIOA, &GPIO_InitStruct);
+#endif
 
     RCC_USBCLKConfig(RCC_USBCLKSource_PLLCLK_1Div5);
     RCC_APB1PeriphClockCmd(RCC_APB1Periph_USB, ENABLE);
diff --git a/Makefile.STM32FX b/Makefile.STM32FX
index 645bb9e..5e0bb96 100644
--- a/Makefile.STM32FX
+++ b/Makefile.STM32FX
@@ -253,35 +253,3 @@ clean:
 	test ! -d $(OBJDIR_F4) || rm -rf $(OBJDIR_F4)
 	rm -f $(BINDIR)/*.bin $(BINDIR)/*.elf
 
-stlink:
-	$(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1) 0x8000000
-
-stlink-nobl:
-	$(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1NOBL) 0x8000000
-
-stlink-bl:
-	$(ST_FLASH) $(ST_FLASH_OPTS) write $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13_long_rst.bin 0x8000000
-	sleep 3
-	$(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1BL) 0x8002000
-
-stlink-bl-old:
-	$(ST_FLASH) $(ST_FLASH_OPTS) write $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13.bin 0x8000000
-	sleep 3
-	$(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1BL) 0x8002000
-
-serial:
-	$(STM32FLASH) -v -w bin/$(BINBIN_F1) -g 0x0 $(devser)
-
-serial-nobl:
-	$(STM32FLASH) -v -w bin/$(BINBIN_F1NOBL) -g 0x0 $(devser)
-
-serial-bl:
-	$(STM32FLASH) -v -w $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13_long_rst.bin -g 0x0 $(devser)
-	sleep 3
-	$(STM32FLASH) -v -w bin/$(BINBIN_F1BL) -g 0x0 -S 0x08002000 $(devser)
-
-serial-bl-old:
-	$(STM32FLASH) -v -w $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13.bin -g 0x0 $(devser)
-	sleep 3
-	$(STM32FLASH) -v -w bin/$(BINBIN_F1BL) -g 0x0 -S 0x08002000 $(devser)
-