Implement requested changes

3 files changed, 8 insertions, 27 deletions

diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c
index 003ccdd90..5bd6e8758 100644
--- a/ports/stm/supervisor/internal_flash.c
+++ b/ports/stm/supervisor/internal_flash.c
@@ -181,25 +181,6 @@ void supervisor_flash_flush(void) {
             reset_into_safe_mode(FLASH_WRITE_FAIL);
         }
 
-        // __HAL_FLASH_DATA_CACHE_DISABLE();
-        // __HAL_FLASH_INSTRUCTION_CACHE_DISABLE();
-
-        // __HAL_FLASH_DATA_CACHE_RESET();
-        // __HAL_FLASH_INSTRUCTION_CACHE_RESET();
-
-        // __HAL_FLASH_INSTRUCTION_CACHE_ENABLE();
-        // __HAL_FLASH_DATA_CACHE_ENABLE();
-
-        // // reprogram the sector
-        // for (uint32_t i = 0; i < sector_size; i++) {
-        //     if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_BYTE, sector_start_addr, (uint64_t)_flash_cache[i]) != HAL_OK) {
-        //         // error occurred during flash write
-        //         HAL_FLASH_Lock(); // lock the flash
-        //         mp_printf(&mp_plat_print, "FLASH WRITE ERROR");
-        //     }
-        //     sector_start_addr += 1;
-        // }
-
         uint32_t * cache_addr = (uint32_t*)_flash_cache;
 
         #if defined(STM32H7)
diff --git a/ports/stm/supervisor/internal_flash.h b/ports/stm/supervisor/internal_flash.h
index 37f0b25e4..665b194c5 100644
--- a/ports/stm/supervisor/internal_flash.h
+++ b/ports/stm/supervisor/internal_flash.h
@@ -36,7 +36,6 @@
 #define STM32_FLASH_SIZE 0x80000 //512KiB
 #define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
-#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 #endif
 
 #ifdef STM32F411xE
@@ -46,7 +45,6 @@
 #else
 #define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
-#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 #endif
 #endif
 
@@ -54,30 +52,28 @@
 #define STM32_FLASH_SIZE 0x100000 //1MB
 #define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
-#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 #endif
 
 #ifdef STM32F405xx
 #define STM32_FLASH_SIZE 0x100000 //1MB
 #define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
-#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 #endif
 
 #ifdef STM32F407xx
 #define STM32_FLASH_SIZE 0x100000 //1MB
 #define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000
-#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 #endif
 
 #ifdef STM32H743xx
 #define STM32_FLASH_SIZE 0x200000 //2MB
 #define INTERNAL_FLASH_FILESYSTEM_SIZE 0x20000 //128KiB
 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08020000
-#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 #endif
 
+#define INTERNAL_FLASH_FILESYSTEM_NUM_BLOCKS (INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
+
 #define STM32_FLASH_OFFSET 0x8000000 //All STM32 chips map to this flash location
 
 #define INTERNAL_FLASH_SYSTICK_MASK     (0x1ff) // 512ms
diff --git a/ports/stm/supervisor/usb.c b/ports/stm/supervisor/usb.c
index 66c55d760..997bf413f 100644
--- a/ports/stm/supervisor/usb.c
+++ b/ports/stm/supervisor/usb.c
@@ -80,8 +80,10 @@ void init_usb_hardware(void) {
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     #if defined(STM32H7)
     GPIO_InitStruct.Alternate = GPIO_AF10_OTG1_FS;
-    #else
+    #elif defined(STM32F4)
     GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS;
+    #else
+    #error Unsupported processor
     #endif
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
     never_reset_pin_number(0, 11);
@@ -103,8 +105,10 @@ void init_usb_hardware(void) {
     GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
     #if defined(STM32H7)
     GPIO_InitStruct.Alternate = GPIO_AF10_OTG1_FS;
-    #else
+    #elif defined(STM32F4)
     GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS;
+    #else
+    #error Unsupported processor
     #endif
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
     never_reset_pin_number(0, 10);