1008 files changed, 1849 insertions, 885 deletions

diff --git a/ports/stm32f4/.gitignore b/ports/stm32f4/.gitignore
new file mode 100644
index 000000000..009ad7493
--- /dev/null
+++ b/ports/stm32f4/.gitignore
@@ -0,0 +1,8 @@
+# Build files
+#####################
+build-*/
+
+# Reference files
+#####################
+ref/
+
diff --git a/ports/stm32f4/Makefile b/ports/stm32f4/Makefile
index 90e81291f..f6933e743 100755
--- a/ports/stm32f4/Makefile
+++ b/ports/stm32f4/Makefile
@@ -63,11 +63,11 @@ INC += -I.
 INC += -I../..
 INC += -I$(BUILD)
 INC += -I$(BUILD)/genhdr
-INC += -I./cubeMXInc
-INC += -I./cubeMXDrivers/STM32F4xx_HAL_Driver/Inc
-INC += -I./cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/Legacy
-INC += -I./cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include
-INC += -I./cubeMXDrivers/CMSIS/Include
+INC += -I./stm32cube/STM32F4xx_HAL_Driver/Inc
+INC += -I./stm32cube/STM32F4xx_HAL_Driver/Inc/Legacy
+INC += -I./stm32cube/CMSIS/Device/ST/STM32F4xx/Include
+INC += -I./stm32cube/CMSIS/Include
+INC += -I./boards
 INC += -I./boards/$(BOARD)
 INC += -I../../lib/mp-readline
 INC += -I../../lib/tinyusb/src
@@ -87,9 +87,16 @@ endif
 # C defines
 C_DEFS =  \
 -DUSE_HAL_DRIVER \
--DSTM32F411xE \
+-DSTM32F412Zx \
 -DUSE_HAL_DRIVER \
--DSTM32F411xE
+-DSTM32F412Zx
+
+# C defines
+#C_DEFS =  \
+#-DUSE_HAL_DRIVER \
+#-DSTM32F411xE \
+#-DUSE_HAL_DRIVER \
+#-DSTM32F411xE
 
 #TODO: Add ASM Flags? -Werror
 CFLAGS += $(INC) -Wall -std=gnu11 -nostdlib $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
@@ -128,32 +135,28 @@ endif
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=4096 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128
 
 
-
 ######################################
 # source
 ######################################
 
-#cubeMXsrc/stm32f4xx_it.c \
-#cubeMXsrc/stm32f4xx_hal_msp.c \
-
 SRC_STM32 = \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c \
-	cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c \
-	cubeMXsrc/system_stm32f4xx.c  
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c \
+	stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c \
+	system_stm32f4xx.c  
 
 
 SRC_C += \
@@ -180,7 +183,10 @@ SRC_C += \
 
 SRC_S = \
 	supervisor/cpu.s \
-	startup_stm32f411xe.s
+	boards/startup_stm32f412zx.s
+#	boards/startup_stm32f411xe.s
+	
+#boards/startup_stm32f412zx.s
 
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
diff --git a/ports/stm32f4/REF/main.c b/ports/stm32f4/REF/main.c
deleted file mode 100644
index cc67d3682..000000000
--- a/ports/stm32f4/REF/main.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file           : main.c
-  * @brief          : Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UART_HandleTypeDef huart2;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-void SystemClock_Config(void);
-static void MX_GPIO_Init(void);
-static void MX_USART2_UART_Init(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
-int main(void)
-{
-  /* USER CODE BEGIN 1 */
-
-  /* USER CODE END 1 */
-  
-
-  /* MCU Configuration--------------------------------------------------------*/
-
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
-
-  /* USER CODE BEGIN Init */
-
-  /* USER CODE END Init */
-
-  /* Configure the system clock */
-  SystemClock_Config();
-
-  /* USER CODE BEGIN SysInit */
-
-  /* USER CODE END SysInit */
-
-  /* Initialize all configured peripherals */
-  MX_GPIO_Init();
-  MX_USART2_UART_Init();
-  /* USER CODE BEGIN 2 */
-
-  /* USER CODE END 2 */
-
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
-    /* USER CODE END WHILE */
-
-    /* USER CODE BEGIN 3 */
-    HAL_GPIO_TogglePin(GPIOA, GPIO_PIN_5);
-    HAL_Delay(1000);
-  }
-  /* USER CODE END 3 */
-}
-
-/**
-  * @brief System Clock Configuration
-  * @retval None
-  */
-void SystemClock_Config(void)
-{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
-  /** Configure the main internal regulator output voltage 
-  */
-  __HAL_RCC_PWR_CLK_ENABLE();
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
-  /** Initializes the CPU, AHB and APB busses clocks 
-  */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
-  RCC_OscInitStruct.PLL.PLLM = 16;
-  RCC_OscInitStruct.PLL.PLLN = 336;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
-  RCC_OscInitStruct.PLL.PLLQ = 4;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /** Initializes the CPU, AHB and APB busses clocks 
-  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-}
-
-/**
-  * @brief USART2 Initialization Function
-  * @param None
-  * @retval None
-  */
-static void MX_USART2_UART_Init(void)
-{
-
-  /* USER CODE BEGIN USART2_Init 0 */
-
-  /* USER CODE END USART2_Init 0 */
-
-  /* USER CODE BEGIN USART2_Init 1 */
-
-  /* USER CODE END USART2_Init 1 */
-  huart2.Instance = USART2;
-  huart2.Init.BaudRate = 115200;
-  huart2.Init.WordLength = UART_WORDLENGTH_8B;
-  huart2.Init.StopBits = UART_STOPBITS_1;
-  huart2.Init.Parity = UART_PARITY_NONE;
-  huart2.Init.Mode = UART_MODE_TX_RX;
-  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_UART_Init(&huart2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN USART2_Init 2 */
-
-  /* USER CODE END USART2_Init 2 */
-
-}
-
-/**
-  * @brief GPIO Initialization Function
-  * @param None
-  * @retval None
-  */
-static void MX_GPIO_Init(void)
-{
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* GPIO Ports Clock Enable */
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-
-  /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(LD2_GPIO_Port, LD2_Pin, GPIO_PIN_RESET);
-
-  /*Configure GPIO pin : B1_Pin */
-  GPIO_InitStruct.Pin = B1_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(B1_GPIO_Port, &GPIO_InitStruct);
-
-  /*Configure GPIO pin : LD2_Pin */
-  GPIO_InitStruct.Pin = LD2_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(LD2_GPIO_Port, &GPIO_InitStruct);
-
-}
-
-/* USER CODE BEGIN 4 */
-
-/* USER CODE END 4 */
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
-void Error_Handler(void)
-{
-  /* USER CODE BEGIN Error_Handler_Debug */
-  /* User can add his own implementation to report the HAL error return state */
-
-  /* USER CODE END Error_Handler_Debug */
-}
-
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{ 
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-     tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* USER CODE END 6 */
-}
-#endif /* USE_FULL_ASSERT */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/REF/stm32f411.ld b/ports/stm32f4/REF/stm32f411.ld
deleted file mode 100644
index 9e3e6bc15..000000000
--- a/ports/stm32f4/REF/stm32f411.ld
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    GNU linker script for STM32F411
-*/
-
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
-    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1,2,3 are 16K, 4 is 64K */
-    FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 384K /* sectors 5,6,7 are 128K */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 128K
-}
-
-/* produce a link error if there is not this amount of RAM for these sections */
-_minimum_stack_size = 2K;
-_minimum_heap_size = 16K;
-
-/* Define tho top end of the stack.  The stack is full descending so begins just
-   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
-   aligned for a call. */
-_estack = ORIGIN(RAM) + LENGTH(RAM);
-
-/* RAM extents for the garbage collector */
-_ram_start = ORIGIN(RAM);
-_ram_end = ORIGIN(RAM) + LENGTH(RAM);
-_heap_start = _ebss; /* heap starts just after statically allocated memory */
-_heap_end = 0x2001c000; /* tunable */
diff --git a/ports/stm32f4/REF/stm32f411_af.csv b/ports/stm32f4/REF/stm32f411_af.csv
deleted file mode 100644
index d5b7a61de..000000000
--- a/ports/stm32f4/REF/stm32f411_af.csv
+++ /dev/null
@@ -1,84 +0,0 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS_AF,TIM1/TIM2,TIM3/TIM4/TIM5,TIM9/TIM10/TIM11,I2C1/I2C2/I2C3,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3,SPI2/I2S2/SPI3/I2S3/SPI4/I2S4/SPI5/I2S5,SPI3/I2S3/USART1/USART2,USART6,I2C2/I2C3,,,SDIO,,,,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,,,,,USART2_CTS,,,,,,,,EVENTOUT,ADC1_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,SPI4_MOSI/I2S4_SD,,USART2_RTS,,,,,,,,EVENTOUT,ADC1_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,I2S2_CKIN,,USART2_TX,,,,,,,,EVENTOUT,ADC1_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,I2S2_MCK,,USART2_RX,,,,,,,,EVENTOUT,ADC1_IN3
-PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,,,,EVENTOUT,ADC1_IN4
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,,,SPI1_SCK/I2S1_CK,,,,,,,,,,EVENTOUT,ADC1_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,,,SPI1_MISO,I2S2_MCK,,,,,,SDIO_CMD,,,EVENTOUT,ADC1_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,,,SPI1_MOSI/I2S1_SD,,,,,,,,,,EVENTOUT,ADC1_IN7
-PortA,PA8,MCO_1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,USB_FS_SOF,,SDIO_D1,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,,,USART1_TX,,,USB_FS_VBUS,,SDIO_D2,,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,,,,SPI5_MOSI/I2S5_SD,USART1_RX,,,USB_FS_ID,,,,,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,,,,SPI4_MISO,USART1_CTS,USART6_TX,,USB_FS_DM,,,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,,,,SPI5_MISO,USART1_RTS,USART6_RX,,USB_FS_DP,,,,,EVENTOUT,
-PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART1_TX,,,,,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,,,,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,ADC1_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,,,,SPI5_NSS/I2S5_WS,,,,,,,,,EVENTOUT,ADC1_IN9
-PortB,PB2,,,,,,,,,,,,,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,USART1_RX,,I2C2_SDA,,,,,,EVENTOUT,
-PortB,PB4,JTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,I2S3ext_SD,,I2C3_SDA,,,SDIO_D0,,,EVENTOUT,
-PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,,,,,SDIO_D3,,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,,,,,,,EVENTOUT,
-PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,,,,,SDIO_D0,,,EVENTOUT,
-PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,SPI5_MOSI/I2S5_SD,,,I2C3_SDA,,,SDIO_D4,,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,I2C2_SDA,,,SDIO_D5,,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,I2S3_MCK,,,,,,SDIO_D7,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,I2S2_CKIN,,,,,,,,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,SPI4_NSS/I2S4_WS,SPI3_SCK/I2S3_CK,,,,,,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,SPI4_SCK/I2S4_CK,,,,,,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,,,SPI2_MISO,I2S2ext_SD,,,,,,SDIO_D6,,,EVENTOUT,
-PortB,PB15,RTC_50Hz,TIM1_CH3N,,,,SPI2_MOSI/I2S2_SD,,,,,,,SDIO_CK,,,EVENTOUT,
-PortC,PC0,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN10
-PortC,PC1,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,,,,,,,,,EVENTOUT,ADC1_IN12
-PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,,,,,,,,,EVENTOUT,ADC1_IN13
-PortC,PC4,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN14
-PortC,PC5,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN15
-PortC,PC6,,,TIM3_CH1,,,I2S2_MCK,,,USART6_TX,,,,SDIO_D6,,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,,,SPI2_SCK/I2S2_CK,I2S3_MCK,,USART6_RX,,,,SDIO_D7,,,EVENTOUT,
-PortC,PC8,,,TIM3_CH3,,,,,,USART6_CK,,,,SDIO_D0,,,EVENTOUT,
-PortC,PC9,MCO_2,,TIM3_CH4,,I2C3_SDA,I2S2_CKIN,,,,,,,SDIO_D1,,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,,,,,,SDIO_D2,,,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,,,,,,SDIO_D3,,,EVENTOUT,
-PortC,PC12,,,,,,,SPI3_MOSI/I2S3_SD,,,,,,SDIO_CK,,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD1,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD2,,,TIM3_ETR,,,,,,,,,,SDIO_CMD,,,EVENTOUT,
-PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS,,,,,,,,EVENTOUT,
-PortD,PD4,,,,,,,,USART2_RTS,,,,,,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,,,,,,EVENTOUT,
-PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,,USART2_RX,,,,,,,,EVENTOUT,
-PortD,PD7,,,,,,,,USART2_CK,,,,,,,,EVENTOUT,
-PortD,PD8,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD9,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD10,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD11,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,,,,,,,,,,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,,,,,,,,,,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,,,,,,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,,,,,,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,,,,,,,,,,,,,EVENTOUT,
-PortE,PE1,,,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE2,TRACECLK,,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE4,TRACED1,,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,,,,,,,,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SPI5_MISO,,,,,,,,,EVENTOUT,
-PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,,,,,,,,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,,,,,,,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,SPI5_MISO,,,,,,,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,,,,,,,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
diff --git a/ports/stm32f4/REF/STM32F411RETx_FLASH.ld b/ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld
index f0d4804f9..da1efdecc 100644
--- a/ports/stm32f4/REF/STM32F411RETx_FLASH.ld
+++ b/ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld
@@ -6,8 +6,8 @@
 **
 **  Author		: Auto-generated by Ac6 System Workbench
 **
-**  Abstract    : Linker script for STM32F411RETx series
-**                512Kbytes FLASH and 128Kbytes RAM
+**  Abstract    : Linker script for STM32F412ZGTx series
+**                1024Kbytes FLASH and 256Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
 **                to application requirements.
@@ -53,7 +53,7 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = 0x20020000;    /* end of RAM */
+_estack = 0x20040000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
 _Min_Heap_Size = 0x200;      /* required amount of heap  */
 _Min_Stack_Size = 0x400; /* required amount of stack */
@@ -61,8 +61,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 /* Specify the memory areas */
 MEMORY
 {
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
-FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 512K
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 256K
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 1024K
 }
 
 /* Define output sections */
diff --git a/ports/stm32f4/cubeMXInc/stm32f4xx_hal_conf.h b/ports/stm32f4/boards/nucleo_f411re/stm32f4xx_hal_conf.h
index 1cceba898..1cceba898 100644
--- a/ports/stm32f4/cubeMXInc/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/nucleo_f411re/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/nucleo_f412zg/board.c b/ports/stm32f4/boards/nucleo_f412zg/board.c
new file mode 100644
index 000000000..4421970ee
--- /dev/null
+++ b/ports/stm32f4/boards/nucleo_f412zg/board.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "boards/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+  return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/stm32f4/boards/nucleo_f412zg/mpconfigboard.h b/ports/stm32f4/boards/nucleo_f412zg/mpconfigboard.h
new file mode 100644
index 000000000..c029f8f75
--- /dev/null
+++ b/ports/stm32f4/boards/nucleo_f412zg/mpconfigboard.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ * Copyright (c) 2018 Dan Halbert for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "NUCLEO-F412ZG"
+#define MICROPY_HW_MCU_NAME         "STM32F412xGS"
+
+#define FLASH_SIZE                  (0x100000)
+#define FLASH_PAGE_SIZE             (0x4000)
+
+#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
+#define AUTORESET_DELAY_MS 500
+#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
\ No newline at end of file
diff --git a/ports/stm32f4/boards/nucleo_f412zg/mpconfigboard.mk b/ports/stm32f4/boards/nucleo_f412zg/mpconfigboard.mk
new file mode 100644
index 000000000..791c5c551
--- /dev/null
+++ b/ports/stm32f4/boards/nucleo_f412zg/mpconfigboard.mk
@@ -0,0 +1,11 @@
+USB_VID = 0x239A
+USB_PID = 0x802A
+USB_PRODUCT = "A glorious potato"
+USB_MANUFACTURER = "Adafruit Industries LLC"
+
+MCU_SERIES = f4
+CMSIS_MCU = STM32F412xG
+LD_FILE = boards/STM32F412ZGTx_FLASH.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
diff --git a/ports/stm32f4/boards/nucleo_f412zg/stm32f4xx_hal_conf.h b/ports/stm32f4/boards/nucleo_f412zg/stm32f4xx_hal_conf.h
new file mode 100644
index 000000000..67343d525
--- /dev/null
+++ b/ports/stm32f4/boards/nucleo_f412zg/stm32f4xx_hal_conf.h
@@ -0,0 +1,439 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf_template.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration template file. 
+  *          This file should be copied to the application folder and renamed
+  *          to stm32f4xx_hal_conf.h.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */ 
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_H
+#define __STM32F4xx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver 
+  */
+#define HAL_MODULE_ENABLED  
+
+  /* #define HAL_ADC_MODULE_ENABLED   */
+/* #define HAL_CRYP_MODULE_ENABLED   */
+/* #define HAL_CAN_MODULE_ENABLED   */
+/* #define HAL_CRC_MODULE_ENABLED   */
+/* #define HAL_CRYP_MODULE_ENABLED   */
+/* #define HAL_DAC_MODULE_ENABLED   */
+/* #define HAL_DCMI_MODULE_ENABLED   */
+/* #define HAL_DMA2D_MODULE_ENABLED   */
+/* #define HAL_ETH_MODULE_ENABLED   */
+/* #define HAL_NAND_MODULE_ENABLED   */
+/* #define HAL_NOR_MODULE_ENABLED   */
+/* #define HAL_PCCARD_MODULE_ENABLED   */
+/* #define HAL_SRAM_MODULE_ENABLED   */
+/* #define HAL_SDRAM_MODULE_ENABLED   */
+/* #define HAL_HASH_MODULE_ENABLED   */
+/* #define HAL_I2C_MODULE_ENABLED   */
+/* #define HAL_I2S_MODULE_ENABLED   */
+/* #define HAL_IWDG_MODULE_ENABLED   */
+/* #define HAL_LTDC_MODULE_ENABLED   */
+/* #define HAL_RNG_MODULE_ENABLED   */
+/* #define HAL_RTC_MODULE_ENABLED   */
+/* #define HAL_SAI_MODULE_ENABLED   */
+/* #define HAL_SD_MODULE_ENABLED   */
+/* #define HAL_MMC_MODULE_ENABLED   */
+/* #define HAL_SPI_MODULE_ENABLED   */
+/* #define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED   */
+/* #define HAL_IRDA_MODULE_ENABLED   */
+/* #define HAL_SMARTCARD_MODULE_ENABLED   */
+/* #define HAL_WWDG_MODULE_ENABLED   */
+//#define HAL_PCD_MODULE_ENABLED
+/* #define HAL_HCD_MODULE_ENABLED   */
+/* #define HAL_DSI_MODULE_ENABLED   */
+/* #define HAL_QSPI_MODULE_ENABLED   */
+/* #define HAL_QSPI_MODULE_ENABLED   */
+/* #define HAL_CEC_MODULE_ENABLED   */
+/* #define HAL_FMPI2C_MODULE_ENABLED   */
+/* #define HAL_SPDIFRX_MODULE_ENABLED   */
+/* #define HAL_DFSDM_MODULE_ENABLED   */
+/* #define HAL_LPTIM_MODULE_ENABLED   */
+/* #define HAL_EXTI_MODULE_ENABLED   */
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).  
+  */
+#if !defined  (HSE_VALUE) 
+  #define HSE_VALUE    ((uint32_t)8000000U) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (HSE_STARTUP_TIMEOUT)
+  #define HSE_STARTUP_TIMEOUT    ((uint32_t)100U)   /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL). 
+  */
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    ((uint32_t)16000000U) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined  (LSI_VALUE) 
+ #define LSI_VALUE  ((uint32_t)32000U)       /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
+                                             The real value may vary depending on the variations
+                                             in voltage and temperature.*/
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#if !defined  (LSE_VALUE)
+ #define LSE_VALUE  ((uint32_t)32768U)    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#if !defined  (LSE_STARTUP_TIMEOUT)
+  #define LSE_STARTUP_TIMEOUT    ((uint32_t)5000U)   /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source 
+  *        frequency, this source is inserted directly through I2S_CKIN pad. 
+  */
+#if !defined  (EXTERNAL_CLOCK_VALUE)
+  #define EXTERNAL_CLOCK_VALUE    ((uint32_t)12288000U) /*!< Value of the External audio frequency in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE		      ((uint32_t)3300U) /*!< Value of VDD in mv */           
+#define  TICK_INT_PRIORITY            ((uint32_t)0U)   /*!< tick interrupt priority */            
+#define  USE_RTOS                     0U     
+#define  PREFETCH_ENABLE              1U
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#define  DATA_CACHE_ENABLE            1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the 
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1U */
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */   
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    ((uint32_t)4U)       /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    ((uint32_t)4U)       /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848_PHY_ADDRESS Address*/ 
+#define DP83848_PHY_ADDRESS           0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/ 
+#define PHY_RESET_DELAY                 ((uint32_t)0x000000FFU)
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                ((uint32_t)0x00000FFFU)
+
+#define PHY_READ_TO                     ((uint32_t)0x0000FFFFU)
+#define PHY_WRITE_TO                    ((uint32_t)0x0000FFFFU)
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000U)    /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001U)    /*!< Transceiver Basic Status Register    */
+ 
+#define PHY_RESET                       ((uint16_t)0x8000U)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000U)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100U)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000U)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100U)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000U)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000U)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200U)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800U)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400U)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020U)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004U)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002U)  /*!< Jabber condition detected            */
+  
+/* Section 4: Extended PHY Registers */
+#define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */
+
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002U)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004U)  /*!< PHY Duplex mask                                 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+* Activated: CRC code is present inside driver
+* Deactivated: CRC code cleaned from driver
+*/
+
+#define USE_SPI_CRC                     0U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file 
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32f4xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+   
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+  #include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32f4xx_hal_cryp.h" 
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+  #include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+  #include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+ 
+#ifdef HAL_SRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+  #include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+  #include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+  #include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */ 
+  
+#ifdef HAL_SDRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */      
+
+#ifdef HAL_HASH_MODULE_ENABLED
+ #include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+ #include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+ #include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+ #include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+ #include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+ #include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+ #include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+ #include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+ #include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+ #include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+ #include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+ #include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+   
+#ifdef HAL_DSI_MODULE_ENABLED
+ #include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+ #include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+ #include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+ #include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+   
+/* Exported macro ------------------------------------------------------------*/
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr: If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed. 
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */    
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_H */
+ 
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/startup_stm32f411xe.s b/ports/stm32f4/boards/startup_stm32f411xe.s
index 3aac640cb..3aac640cb 100644
--- a/ports/stm32f4/startup_stm32f411xe.s
+++ b/ports/stm32f4/boards/startup_stm32f411xe.s
diff --git a/ports/stm32f4/boards/startup_stm32f412zx.s b/ports/stm32f4/boards/startup_stm32f412zx.s
new file mode 100644
index 000000000..801220795
--- /dev/null
+++ b/ports/stm32f4/boards/startup_stm32f412zx.s
@@ -0,0 +1,524 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32f412zx.s
+  * @author    MCD Application Team
+  * @brief     STM32F412Zx Devices vector table for GCC based toolchains. 
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2017 STMicroelectronics</center></h2>
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *   1. Redistributions of source code must retain the above copyright notice,
+  *      this list of conditions and the following disclaimer.
+  *   2. Redistributions in binary form must reproduce the above copyright notice,
+  *      this list of conditions and the following disclaimer in the documentation
+  *      and/or other materials provided with the distribution.
+  *   3. Neither the name of STMicroelectronics nor the names of its contributors
+  *      may be used to endorse or promote products derived from this software
+  *      without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *
+  ******************************************************************************
+  */
+    
+  .syntax unified
+  .cpu cortex-m4
+  .fpu softvfp
+  .thumb
+
+.global  g_pfnVectors
+.global  Default_Handler
+
+/* start address for the initialization values of the .data section. 
+defined in linker script */
+.word  _sidata
+/* start address for the .data section. defined in linker script */
+.word  _sdata
+/* end address for the .data section. defined in linker script */
+.word  _edata
+/* start address for the .bss section. defined in linker script */
+.word  _sbss
+/* end address for the .bss section. defined in linker script */
+.word  _ebss
+/* stack used for SystemInit_ExtMemCtl; always internal RAM used */
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called. 
+ * @param  None
+ * @retval : None
+*/
+
+    .section  .text.Reset_Handler
+  .weak  Reset_Handler
+  .type  Reset_Handler, %function
+Reset_Handler:  
+  ldr   sp, =_estack       /* set stack pointer */
+
+/* Copy the data segment initializers from flash to SRAM */
+  movs  r1, #0
+  b  LoopCopyDataInit
+
+CopyDataInit:
+  ldr  r3, =_sidata
+  ldr  r3, [r3, r1]
+  str  r3, [r0, r1]
+  adds  r1, r1, #4
+    
+LoopCopyDataInit:
+  ldr  r0, =_sdata
+  ldr  r3, =_edata
+  adds  r2, r0, r1
+  cmp  r2, r3
+  bcc  CopyDataInit
+  ldr  r2, =_sbss
+  b  LoopFillZerobss
+/* Zero fill the bss segment. */
+FillZerobss:
+  movs  r3, #0
+  str  r3, [r2], #4
+    
+LoopFillZerobss:
+  ldr  r3, = _ebss
+  cmp  r2, r3
+  bcc  FillZerobss
+
+/* Call the clock system intitialization function.*/
+  bl  SystemInit   
+/* Call static constructors */
+/*    bl __libc_init_array */
+/* Call the application's entry point.*/
+  bl  main
+  bx  lr    
+.size  Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an 
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ * @param  None     
+ * @retval None       
+*/
+    .section  .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b  Infinite_Loop
+  .size  Default_Handler, .-Default_Handler
+/******************************************************************************
+*
+* The minimal vector table for a Cortex M3. Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+* 
+*******************************************************************************/
+   .section  .isr_vector,"a",%progbits
+  .type  g_pfnVectors, %object
+  .size  g_pfnVectors, .-g_pfnVectors
+    
+g_pfnVectors:
+  .word  _estack
+  .word  Reset_Handler
+  .word  NMI_Handler
+  .word  HardFault_Handler
+  .word  MemManage_Handler
+  .word  BusFault_Handler
+  .word  UsageFault_Handler
+  .word  0
+  .word  0
+  .word  0
+  .word  0
+  .word  SVC_Handler
+  .word  DebugMon_Handler
+  .word  0
+  .word  PendSV_Handler
+  .word  SysTick_Handler
+
+  /* External Interrupts */
+  .word     WWDG_IRQHandler                   /* Window WatchDog                             */
+  .word     PVD_IRQHandler                    /* PVD through EXTI Line detection             */
+  .word     TAMP_STAMP_IRQHandler             /* Tamper and TimeStamps through the EXTI line */
+  .word     RTC_WKUP_IRQHandler               /* RTC Wakeup through the EXTI line            */
+  .word     FLASH_IRQHandler                  /* FLASH                                       */
+  .word     RCC_IRQHandler                    /* RCC                                         */
+  .word     EXTI0_IRQHandler                  /* EXTI Line0                                  */
+  .word     EXTI1_IRQHandler                  /* EXTI Line1                                  */
+  .word     EXTI2_IRQHandler                  /* EXTI Line2                                  */
+  .word     EXTI3_IRQHandler                  /* EXTI Line3                                  */
+  .word     EXTI4_IRQHandler                  /* EXTI Line4                                  */
+  .word     DMA1_Stream0_IRQHandler           /* DMA1 Stream 0                               */
+  .word     DMA1_Stream1_IRQHandler           /* DMA1 Stream 1                               */
+  .word     DMA1_Stream2_IRQHandler           /* DMA1 Stream 2                               */
+  .word     DMA1_Stream3_IRQHandler           /* DMA1 Stream 3                               */
+  .word     DMA1_Stream4_IRQHandler           /* DMA1 Stream 4                               */
+  .word     DMA1_Stream5_IRQHandler           /* DMA1 Stream 5                               */
+  .word     DMA1_Stream6_IRQHandler           /* DMA1 Stream 6                               */
+  .word     ADC_IRQHandler                    /* ADC1, ADC2 and ADC3s                        */
+  .word     CAN1_TX_IRQHandler                /* CAN1 TX                                     */
+  .word     CAN1_RX0_IRQHandler               /* CAN1 RX0                                    */
+  .word     CAN1_RX1_IRQHandler               /* CAN1 RX1                                    */
+  .word     CAN1_SCE_IRQHandler               /* CAN1 SCE                                    */
+  .word     EXTI9_5_IRQHandler                /* External Line[9:5]s                         */
+  .word     TIM1_BRK_TIM9_IRQHandler          /* TIM1 Break and TIM9                         */
+  .word     TIM1_UP_TIM10_IRQHandler          /* TIM1 Update and TIM10                       */
+  .word     TIM1_TRG_COM_TIM11_IRQHandler     /* TIM1 Trigger and Commutation and TIM11      */
+  .word     TIM1_CC_IRQHandler                /* TIM1 Capture Compare                        */
+  .word     TIM2_IRQHandler                   /* TIM2                                        */
+  .word     TIM3_IRQHandler                   /* TIM3                                        */
+  .word     TIM4_IRQHandler                   /* TIM4                                        */
+  .word     I2C1_EV_IRQHandler                /* I2C1 Event                                  */
+  .word     I2C1_ER_IRQHandler                /* I2C1 Error                                  */
+  .word     I2C2_EV_IRQHandler                /* I2C2 Event                                  */
+  .word     I2C2_ER_IRQHandler                /* I2C2 Error                                  */
+  .word     SPI1_IRQHandler                   /* SPI1                                        */
+  .word     SPI2_IRQHandler                   /* SPI2                                        */
+  .word     USART1_IRQHandler                 /* USART1                                      */
+  .word     USART2_IRQHandler                 /* USART2                                      */
+  .word     USART3_IRQHandler                 /* USART3                                      */
+  .word     EXTI15_10_IRQHandler              /* External Line[15:10]s                       */
+  .word     RTC_Alarm_IRQHandler              /* RTC Alarm (A and B) through EXTI Line       */
+  .word     OTG_FS_WKUP_IRQHandler            /* USB OTG FS Wakeup through EXTI line         */
+  .word     TIM8_BRK_TIM12_IRQHandler         /* TIM8 Break and TIM12                        */
+  .word     TIM8_UP_TIM13_IRQHandler          /* TIM8 Update and TIM13                       */
+  .word     TIM8_TRG_COM_TIM14_IRQHandler     /* TIM8 Trigger and Commutation and TIM14      */
+  .word     TIM8_CC_IRQHandler                /* TIM8 Capture Compare                        */
+  .word     DMA1_Stream7_IRQHandler           /* DMA1 Stream7                                */
+  .word     0                                 /* Reserved                                    */
+  .word     SDIO_IRQHandler                   /* SDIO                                        */
+  .word     TIM5_IRQHandler                   /* TIM5                                        */
+  .word     SPI3_IRQHandler                   /* SPI3                                        */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     TIM6_IRQHandler                   /* TIM6                                        */
+  .word     TIM7_IRQHandler                   /* TIM7                                        */
+  .word     DMA2_Stream0_IRQHandler           /* DMA2 Stream 0                               */
+  .word     DMA2_Stream1_IRQHandler           /* DMA2 Stream 1                               */
+  .word     DMA2_Stream2_IRQHandler           /* DMA2 Stream 2                               */
+  .word     DMA2_Stream3_IRQHandler           /* DMA2 Stream 3                               */
+  .word     DMA2_Stream4_IRQHandler           /* DMA2 Stream 4                               */
+  .word     DFSDM1_FLT0_IRQHandler            /* DFSDM1 Filter0                              */
+  .word     DFSDM1_FLT1_IRQHandler            /* DFSDM1 Filter1                              */
+  .word     CAN2_TX_IRQHandler                /* CAN2 TX                                     */
+  .word     CAN2_RX0_IRQHandler               /* CAN2 RX0                                    */
+  .word     CAN2_RX1_IRQHandler               /* CAN2 RX1                                    */
+  .word     CAN2_SCE_IRQHandler               /* CAN2 SCE                                    */
+  .word     OTG_FS_IRQHandler                 /* USB OTG FS                                  */
+  .word     DMA2_Stream5_IRQHandler           /* DMA2 Stream 5                               */
+  .word     DMA2_Stream6_IRQHandler           /* DMA2 Stream 6                               */
+  .word     DMA2_Stream7_IRQHandler           /* DMA2 Stream 7                               */
+  .word     USART6_IRQHandler                 /* USART6                                      */
+  .word     I2C3_EV_IRQHandler                /* I2C3 event                                  */
+  .word     I2C3_ER_IRQHandler                /* I2C3 error                                  */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     RNG_IRQHandler                    /* RNG                                         */
+  .word     FPU_IRQHandler                    /* FPU                                         */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     SPI4_IRQHandler                   /* SPI4                                        */
+  .word     SPI5_IRQHandler                   /* SPI5                                        */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     QUADSPI_IRQHandler                /* QuadSPI                                     */
+  .word     0                                 /* Reserved                                    */
+  .word     0                                 /* Reserved                                    */
+  .word     FMPI2C1_EV_IRQHandler             /* FMPI2C1 Event                               */
+  .word     FMPI2C1_ER_IRQHandler             /* FMPI2C1 Error                               */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler. 
+* As they are weak aliases, any function with the same name will override 
+* this definition.
+*
+*******************************************************************************/
+   .weak      NMI_Handler
+   .thumb_set NMI_Handler,Default_Handler
+
+   .weak      HardFault_Handler
+   .thumb_set HardFault_Handler,Default_Handler
+
+   .weak      MemManage_Handler
+   .thumb_set MemManage_Handler,Default_Handler
+  
+   .weak      BusFault_Handler
+   .thumb_set BusFault_Handler,Default_Handler
+
+   .weak      UsageFault_Handler
+   .thumb_set UsageFault_Handler,Default_Handler
+
+   .weak      SVC_Handler
+   .thumb_set SVC_Handler,Default_Handler
+
+   .weak      DebugMon_Handler
+   .thumb_set DebugMon_Handler,Default_Handler
+
+   .weak      PendSV_Handler
+   .thumb_set PendSV_Handler,Default_Handler
+
+   .weak      SysTick_Handler
+   .thumb_set SysTick_Handler,Default_Handler
+
+   .weak      WWDG_IRQHandler
+   .thumb_set WWDG_IRQHandler,Default_Handler
+
+   .weak      PVD_IRQHandler
+   .thumb_set PVD_IRQHandler,Default_Handler
+
+   .weak      TAMP_STAMP_IRQHandler
+   .thumb_set TAMP_STAMP_IRQHandler,Default_Handler
+
+   .weak      RTC_WKUP_IRQHandler
+   .thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+   .weak      FLASH_IRQHandler
+   .thumb_set FLASH_IRQHandler,Default_Handler
+
+   .weak      RCC_IRQHandler
+   .thumb_set RCC_IRQHandler,Default_Handler
+
+   .weak      EXTI0_IRQHandler
+   .thumb_set EXTI0_IRQHandler,Default_Handler
+
+   .weak      EXTI1_IRQHandler
+   .thumb_set EXTI1_IRQHandler,Default_Handler
+
+   .weak      EXTI2_IRQHandler
+   .thumb_set EXTI2_IRQHandler,Default_Handler 
+
+   .weak      EXTI3_IRQHandler
+   .thumb_set EXTI3_IRQHandler,Default_Handler
+
+   .weak      EXTI4_IRQHandler
+   .thumb_set EXTI4_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream0_IRQHandler
+   .thumb_set DMA1_Stream0_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream1_IRQHandler
+   .thumb_set DMA1_Stream1_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream2_IRQHandler
+   .thumb_set DMA1_Stream2_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream3_IRQHandler
+   .thumb_set DMA1_Stream3_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream4_IRQHandler
+   .thumb_set DMA1_Stream4_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream5_IRQHandler
+   .thumb_set DMA1_Stream5_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream6_IRQHandler
+   .thumb_set DMA1_Stream6_IRQHandler,Default_Handler
+
+   .weak      ADC_IRQHandler
+   .thumb_set ADC_IRQHandler,Default_Handler
+
+   .weak      CAN1_TX_IRQHandler
+   .thumb_set CAN1_TX_IRQHandler,Default_Handler
+
+   .weak      CAN1_RX0_IRQHandler
+   .thumb_set CAN1_RX0_IRQHandler,Default_Handler
+
+   .weak      CAN1_RX1_IRQHandler
+   .thumb_set CAN1_RX1_IRQHandler,Default_Handler
+
+   .weak      CAN1_SCE_IRQHandler
+   .thumb_set CAN1_SCE_IRQHandler,Default_Handler
+
+   .weak      EXTI9_5_IRQHandler
+   .thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+   .weak      TIM1_BRK_TIM9_IRQHandler
+   .thumb_set TIM1_BRK_TIM9_IRQHandler,Default_Handler
+
+   .weak      TIM1_UP_TIM10_IRQHandler
+   .thumb_set TIM1_UP_TIM10_IRQHandler,Default_Handler
+
+   .weak      TIM1_TRG_COM_TIM11_IRQHandler
+   .thumb_set TIM1_TRG_COM_TIM11_IRQHandler,Default_Handler
+
+   .weak      TIM1_CC_IRQHandler
+   .thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+   .weak      TIM2_IRQHandler
+   .thumb_set TIM2_IRQHandler,Default_Handler
+
+   .weak      TIM3_IRQHandler
+   .thumb_set TIM3_IRQHandler,Default_Handler
+
+   .weak      TIM4_IRQHandler
+   .thumb_set TIM4_IRQHandler,Default_Handler
+
+   .weak      I2C1_EV_IRQHandler
+   .thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+   .weak      I2C1_ER_IRQHandler
+   .thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+   .weak      I2C2_EV_IRQHandler
+   .thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+   .weak      I2C2_ER_IRQHandler
+   .thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+   .weak      SPI1_IRQHandler
+   .thumb_set SPI1_IRQHandler,Default_Handler
+
+   .weak      SPI2_IRQHandler
+   .thumb_set SPI2_IRQHandler,Default_Handler
+
+   .weak      USART1_IRQHandler
+   .thumb_set USART1_IRQHandler,Default_Handler
+
+   .weak      USART2_IRQHandler
+   .thumb_set USART2_IRQHandler,Default_Handler
+
+   .weak      USART3_IRQHandler
+   .thumb_set USART3_IRQHandler,Default_Handler
+
+   .weak      EXTI15_10_IRQHandler
+   .thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+   .weak      RTC_Alarm_IRQHandler
+   .thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+   .weak      OTG_FS_WKUP_IRQHandler
+   .thumb_set OTG_FS_WKUP_IRQHandler,Default_Handler
+
+   .weak      TIM8_BRK_TIM12_IRQHandler
+   .thumb_set TIM8_BRK_TIM12_IRQHandler,Default_Handler
+
+   .weak      TIM8_UP_TIM13_IRQHandler
+   .thumb_set TIM8_UP_TIM13_IRQHandler,Default_Handler
+
+   .weak      TIM8_TRG_COM_TIM14_IRQHandler
+   .thumb_set TIM8_TRG_COM_TIM14_IRQHandler,Default_Handler
+
+   .weak      TIM8_CC_IRQHandler
+   .thumb_set TIM8_CC_IRQHandler,Default_Handler
+
+   .weak      DMA1_Stream7_IRQHandler
+   .thumb_set DMA1_Stream7_IRQHandler,Default_Handler
+
+   .weak      SDIO_IRQHandler
+   .thumb_set SDIO_IRQHandler,Default_Handler
+
+   .weak      TIM5_IRQHandler
+   .thumb_set TIM5_IRQHandler,Default_Handler
+
+   .weak      SPI3_IRQHandler
+   .thumb_set SPI3_IRQHandler,Default_Handler
+
+   .weak      TIM6_IRQHandler
+   .thumb_set TIM6_IRQHandler,Default_Handler
+
+   .weak      TIM7_IRQHandler
+   .thumb_set TIM7_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream0_IRQHandler
+   .thumb_set DMA2_Stream0_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream1_IRQHandler
+   .thumb_set DMA2_Stream1_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream2_IRQHandler
+   .thumb_set DMA2_Stream2_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream3_IRQHandler
+   .thumb_set DMA2_Stream3_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream4_IRQHandler
+   .thumb_set DMA2_Stream4_IRQHandler,Default_Handler
+
+   .weak      DFSDM1_FLT0_IRQHandler
+   .thumb_set DFSDM1_FLT0_IRQHandler,Default_Handler
+
+   .weak      DFSDM1_FLT1_IRQHandler
+   .thumb_set DFSDM1_FLT1_IRQHandler,Default_Handler
+
+   .weak      CAN2_TX_IRQHandler
+   .thumb_set CAN2_TX_IRQHandler,Default_Handler
+
+   .weak      CAN2_RX0_IRQHandler
+   .thumb_set CAN2_RX0_IRQHandler,Default_Handler
+
+   .weak      CAN2_RX1_IRQHandler
+   .thumb_set CAN2_RX1_IRQHandler,Default_Handler
+
+   .weak      CAN2_SCE_IRQHandler
+   .thumb_set CAN2_SCE_IRQHandler,Default_Handler
+
+   .weak      OTG_FS_IRQHandler
+   .thumb_set OTG_FS_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream5_IRQHandler
+   .thumb_set DMA2_Stream5_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream6_IRQHandler
+   .thumb_set DMA2_Stream6_IRQHandler,Default_Handler
+
+   .weak      DMA2_Stream7_IRQHandler
+   .thumb_set DMA2_Stream7_IRQHandler,Default_Handler
+
+   .weak      USART6_IRQHandler
+   .thumb_set USART6_IRQHandler,Default_Handler
+
+   .weak      I2C3_EV_IRQHandler
+   .thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+   .weak      I2C3_ER_IRQHandler
+   .thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+   .weak      RNG_IRQHandler
+   .thumb_set RNG_IRQHandler,Default_Handler
+
+   .weak      FPU_IRQHandler
+   .thumb_set FPU_IRQHandler,Default_Handler
+
+   .weak      SPI4_IRQHandler
+   .thumb_set SPI4_IRQHandler,Default_Handler
+
+   .weak      SPI5_IRQHandler
+   .thumb_set SPI5_IRQHandler,Default_Handler
+
+   .weak      QUADSPI_IRQHandler
+   .thumb_set QUADSPI_IRQHandler,Default_Handler
+
+    .weak     FMPI2C1_EV_IRQHandler
+   .thumb_set FMPI2C1_EV_IRQHandler,Default_Handler
+
+   .weak      FMPI2C1_ER_IRQHandler
+   .thumb_set FMPI2C1_ER_IRQHandler,Default_Handler
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/boards/stm32f412g_disco/board.c b/ports/stm32f4/boards/stm32f412g_disco/board.c
new file mode 100644
index 000000000..4421970ee
--- /dev/null
+++ b/ports/stm32f4/boards/stm32f412g_disco/board.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "boards/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+  return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.h b/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.h
new file mode 100644
index 000000000..416944257
--- /dev/null
+++ b/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ * Copyright (c) 2018 Dan Halbert for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "STM32F412G_DISCO"
+#define MICROPY_HW_MCU_NAME         "STM32F412xGS"
+
+#define FLASH_SIZE                  (0x100000)
+#define FLASH_PAGE_SIZE             (0x4000)
+
+#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
+#define AUTORESET_DELAY_MS 500
+#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
\ No newline at end of file
diff --git a/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.mk b/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.mk
new file mode 100644
index 000000000..406ea762c
--- /dev/null
+++ b/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.mk
@@ -0,0 +1,16 @@
+USB_VID = 0x239A
+USB_PID = 0x802A
+USB_PRODUCT = "A glorious potato"
+USB_MANUFACTURER = "Adafruit Industries LLC"
+
+#USB_VID = 0x483
+#USB_PID = 0x572B
+#USB_PRODUCT = "STM32 Human Interface Potato"
+#USB_MANUFACTURER = "STMicroelectronics"
+
+MCU_SERIES = f4
+CMSIS_MCU = STM32F412xG
+LD_FILE = boards/STM32F412ZGTx_FLASH.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
diff --git a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_conf.h b/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_conf.h
new file mode 100644
index 000000000..67343d525
--- /dev/null
+++ b/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_conf.h
@@ -0,0 +1,439 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf_template.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration template file. 
+  *          This file should be copied to the application folder and renamed
+  *          to stm32f4xx_hal_conf.h.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */ 
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_H
+#define __STM32F4xx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver 
+  */
+#define HAL_MODULE_ENABLED  
+
+  /* #define HAL_ADC_MODULE_ENABLED   */
+/* #define HAL_CRYP_MODULE_ENABLED   */
+/* #define HAL_CAN_MODULE_ENABLED   */
+/* #define HAL_CRC_MODULE_ENABLED   */
+/* #define HAL_CRYP_MODULE_ENABLED   */
+/* #define HAL_DAC_MODULE_ENABLED   */
+/* #define HAL_DCMI_MODULE_ENABLED   */
+/* #define HAL_DMA2D_MODULE_ENABLED   */
+/* #define HAL_ETH_MODULE_ENABLED   */
+/* #define HAL_NAND_MODULE_ENABLED   */
+/* #define HAL_NOR_MODULE_ENABLED   */
+/* #define HAL_PCCARD_MODULE_ENABLED   */
+/* #define HAL_SRAM_MODULE_ENABLED   */
+/* #define HAL_SDRAM_MODULE_ENABLED   */
+/* #define HAL_HASH_MODULE_ENABLED   */
+/* #define HAL_I2C_MODULE_ENABLED   */
+/* #define HAL_I2S_MODULE_ENABLED   */
+/* #define HAL_IWDG_MODULE_ENABLED   */
+/* #define HAL_LTDC_MODULE_ENABLED   */
+/* #define HAL_RNG_MODULE_ENABLED   */
+/* #define HAL_RTC_MODULE_ENABLED   */
+/* #define HAL_SAI_MODULE_ENABLED   */
+/* #define HAL_SD_MODULE_ENABLED   */
+/* #define HAL_MMC_MODULE_ENABLED   */
+/* #define HAL_SPI_MODULE_ENABLED   */
+/* #define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED   */
+/* #define HAL_IRDA_MODULE_ENABLED   */
+/* #define HAL_SMARTCARD_MODULE_ENABLED   */
+/* #define HAL_WWDG_MODULE_ENABLED   */
+//#define HAL_PCD_MODULE_ENABLED
+/* #define HAL_HCD_MODULE_ENABLED   */
+/* #define HAL_DSI_MODULE_ENABLED   */
+/* #define HAL_QSPI_MODULE_ENABLED   */
+/* #define HAL_QSPI_MODULE_ENABLED   */
+/* #define HAL_CEC_MODULE_ENABLED   */
+/* #define HAL_FMPI2C_MODULE_ENABLED   */
+/* #define HAL_SPDIFRX_MODULE_ENABLED   */
+/* #define HAL_DFSDM_MODULE_ENABLED   */
+/* #define HAL_LPTIM_MODULE_ENABLED   */
+/* #define HAL_EXTI_MODULE_ENABLED   */
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).  
+  */
+#if !defined  (HSE_VALUE) 
+  #define HSE_VALUE    ((uint32_t)8000000U) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (HSE_STARTUP_TIMEOUT)
+  #define HSE_STARTUP_TIMEOUT    ((uint32_t)100U)   /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL). 
+  */
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    ((uint32_t)16000000U) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined  (LSI_VALUE) 
+ #define LSI_VALUE  ((uint32_t)32000U)       /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
+                                             The real value may vary depending on the variations
+                                             in voltage and temperature.*/
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#if !defined  (LSE_VALUE)
+ #define LSE_VALUE  ((uint32_t)32768U)    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#if !defined  (LSE_STARTUP_TIMEOUT)
+  #define LSE_STARTUP_TIMEOUT    ((uint32_t)5000U)   /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source 
+  *        frequency, this source is inserted directly through I2S_CKIN pad. 
+  */
+#if !defined  (EXTERNAL_CLOCK_VALUE)
+  #define EXTERNAL_CLOCK_VALUE    ((uint32_t)12288000U) /*!< Value of the External audio frequency in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE		      ((uint32_t)3300U) /*!< Value of VDD in mv */           
+#define  TICK_INT_PRIORITY            ((uint32_t)0U)   /*!< tick interrupt priority */            
+#define  USE_RTOS                     0U     
+#define  PREFETCH_ENABLE              1U
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#define  DATA_CACHE_ENABLE            1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the 
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1U */
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */   
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    ((uint32_t)4U)       /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    ((uint32_t)4U)       /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848_PHY_ADDRESS Address*/ 
+#define DP83848_PHY_ADDRESS           0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/ 
+#define PHY_RESET_DELAY                 ((uint32_t)0x000000FFU)
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                ((uint32_t)0x00000FFFU)
+
+#define PHY_READ_TO                     ((uint32_t)0x0000FFFFU)
+#define PHY_WRITE_TO                    ((uint32_t)0x0000FFFFU)
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000U)    /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001U)    /*!< Transceiver Basic Status Register    */
+ 
+#define PHY_RESET                       ((uint16_t)0x8000U)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000U)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100U)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000U)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100U)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000U)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000U)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200U)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800U)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400U)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020U)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004U)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002U)  /*!< Jabber condition detected            */
+  
+/* Section 4: Extended PHY Registers */
+#define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */
+
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002U)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004U)  /*!< PHY Duplex mask                                 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+* Activated: CRC code is present inside driver
+* Deactivated: CRC code cleaned from driver
+*/
+
+#define USE_SPI_CRC                     0U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file 
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32f4xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+   
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+  #include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32f4xx_hal_cryp.h" 
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+  #include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+  #include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+ 
+#ifdef HAL_SRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+  #include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+  #include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+  #include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */ 
+  
+#ifdef HAL_SDRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */      
+
+#ifdef HAL_HASH_MODULE_ENABLED
+ #include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+ #include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+ #include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+ #include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+ #include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+ #include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+ #include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+ #include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+ #include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+ #include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+ #include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+ #include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+   
+#ifdef HAL_DSI_MODULE_ENABLED
+ #include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+ #include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+ #include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+ #include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+   
+/* Exported macro ------------------------------------------------------------*/
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr: If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed. 
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */    
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_H */
+ 
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/cubeMXInc/stm32f4xx_it.h b/ports/stm32f4/cubeMXInc/stm32f4xx_it.h
deleted file mode 100644
index 0f5054a3d..000000000
--- a/ports/stm32f4/cubeMXInc/stm32f4xx_it.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    stm32f4xx_it.h
-  * @brief   This file contains the headers of the interrupt handlers.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
- ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F4xx_IT_H
-#define __STM32F4xx_IT_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif 
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void NMI_Handler(void);
-void HardFault_Handler(void);
-void MemManage_Handler(void);
-void BusFault_Handler(void);
-void UsageFault_Handler(void);
-void SVC_Handler(void);
-void DebugMon_Handler(void);
-void PendSV_Handler(void);
-void SysTick_Handler(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F4xx_IT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/cubeMXsrc/stm32f4xx_hal_msp.c b/ports/stm32f4/cubeMXsrc/stm32f4xx_hal_msp.c
deleted file mode 100644
index 795c58f3b..000000000
--- a/ports/stm32f4/cubeMXsrc/stm32f4xx_hal_msp.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * File Name          : stm32f4xx_hal_msp.c
-  * Description        : This file provides code for the MSP Initialization 
-  *                      and de-Initialization codes.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
-
-/* USER CODE END TD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN Define */
- 
-/* USER CODE END Define */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN Macro */
-
-/* USER CODE END Macro */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* External functions --------------------------------------------------------*/
-/* USER CODE BEGIN ExternalFunctions */
-
-/* USER CODE END ExternalFunctions */
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-/**
-  * Initializes the Global MSP.
-  */
-void HAL_MspInit(void)
-{
-  /* USER CODE BEGIN MspInit 0 */
-
-  /* USER CODE END MspInit 0 */
-
-  __HAL_RCC_SYSCFG_CLK_ENABLE();
-  __HAL_RCC_PWR_CLK_ENABLE();
-
-  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_0);
-
-  /* System interrupt init*/
-
-  /* USER CODE BEGIN MspInit 1 */
-
-  /* USER CODE END MspInit 1 */
-}
-
-/**
-* @brief UART MSP Initialization
-* This function configures the hardware resources used in this example
-* @param huart: UART handle pointer
-* @retval None
-*/
-void HAL_UART_MspInit(UART_HandleTypeDef* huart)
-{
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  if(huart->Instance==USART2)
-  {
-  /* USER CODE BEGIN USART2_MspInit 0 */
-
-  /* USER CODE END USART2_MspInit 0 */
-    /* Peripheral clock enable */
-    __HAL_RCC_USART2_CLK_ENABLE();
-  
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USART2 GPIO Configuration    
-    PA2     ------> USART2_TX
-    PA3     ------> USART2_RX 
-    */
-    GPIO_InitStruct.Pin = USART_TX_Pin|USART_RX_Pin;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_PULLUP;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* USER CODE BEGIN USART2_MspInit 1 */
-
-  /* USER CODE END USART2_MspInit 1 */
-  }
-
-}
-
-/**
-* @brief UART MSP De-Initialization
-* This function freeze the hardware resources used in this example
-* @param huart: UART handle pointer
-* @retval None
-*/
-void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
-{
-  if(huart->Instance==USART2)
-  {
-  /* USER CODE BEGIN USART2_MspDeInit 0 */
-
-  /* USER CODE END USART2_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_USART2_CLK_DISABLE();
-  
-    /**USART2 GPIO Configuration    
-    PA2     ------> USART2_TX
-    PA3     ------> USART2_RX 
-    */
-    HAL_GPIO_DeInit(GPIOA, USART_TX_Pin|USART_RX_Pin);
-
-  /* USER CODE BEGIN USART2_MspDeInit 1 */
-
-  /* USER CODE END USART2_MspDeInit 1 */
-  }
-
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/cubeMXsrc/stm32f4xx_it.c b/ports/stm32f4/cubeMXsrc/stm32f4xx_it.c
deleted file mode 100644
index 3423bd887..000000000
--- a/ports/stm32f4/cubeMXsrc/stm32f4xx_it.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    stm32f4xx_it.c
-  * @brief   Interrupt Service Routines.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f4xx_it.h"
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
-
-/* USER CODE END TD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
- 
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/* External variables --------------------------------------------------------*/
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/******************************************************************************/
-/*           Cortex-M4 Processor Interruption and Exception Handlers          */ 
-/******************************************************************************/
-/**
-  * @brief This function handles Non maskable interrupt.
-  */
-void NMI_Handler(void)
-{
-  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
-
-  /* USER CODE END NonMaskableInt_IRQn 0 */
-  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
-  /* USER CODE END NonMaskableInt_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Hard fault interrupt.
-  */
-void HardFault_Handler(void)
-{
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-    /* USER CODE END W1_HardFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Memory management fault.
-  */
-void MemManage_Handler(void)
-{
-  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
-
-  /* USER CODE END MemoryManagement_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
-    /* USER CODE END W1_MemoryManagement_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Pre-fetch fault, memory access fault.
-  */
-void BusFault_Handler(void)
-{
-  /* USER CODE BEGIN BusFault_IRQn 0 */
-
-  /* USER CODE END BusFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
-    /* USER CODE END W1_BusFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Undefined instruction or illegal state.
-  */
-void UsageFault_Handler(void)
-{
-  /* USER CODE BEGIN UsageFault_IRQn 0 */
-
-  /* USER CODE END UsageFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
-    /* USER CODE END W1_UsageFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles System service call via SWI instruction.
-  */
-void SVC_Handler(void)
-{
-  /* USER CODE BEGIN SVCall_IRQn 0 */
-
-  /* USER CODE END SVCall_IRQn 0 */
-  /* USER CODE BEGIN SVCall_IRQn 1 */
-
-  /* USER CODE END SVCall_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Debug monitor.
-  */
-void DebugMon_Handler(void)
-{
-  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
-
-  /* USER CODE END DebugMonitor_IRQn 0 */
-  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
-
-  /* USER CODE END DebugMonitor_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Pendable request for system service.
-  */
-void PendSV_Handler(void)
-{
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
-}
-
-/******************************************************************************/
-/* STM32F4xx Peripheral Interrupt Handlers                                    */
-/* Add here the Interrupt Handlers for the used peripherals.                  */
-/* For the available peripheral interrupt handler names,                      */
-/* please refer to the startup file (startup_stm32f4xx.s).                    */
-/******************************************************************************/
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_armcc.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_armcc.h
index 4d9d0645d..4d9d0645d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_armcc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_armcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_armclang.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_armclang.h
index 162a400ea..162a400ea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_armclang.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_armclang.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_compiler.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_compiler.h
index 94212eb87..94212eb87 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_compiler.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_compiler.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_gcc.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_gcc.h
index 2d9db15a5..2d9db15a5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_gcc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_gcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_iccarm.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_iccarm.h
index 11c4af0eb..11c4af0eb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_iccarm.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_iccarm.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_version.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_version.h
index 660f612aa..660f612aa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/cmsis_version.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/cmsis_version.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_armv8mbl.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_armv8mbl.h
index 251e4ede3..251e4ede3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_armv8mbl.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_armv8mbl.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_armv8mml.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_armv8mml.h
index 3a3148ea3..3a3148ea3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_armv8mml.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_armv8mml.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm0.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm0.h
index f929bba07..f929bba07 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm0.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm0.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm0plus.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm0plus.h
index 424011ac3..424011ac3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm0plus.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm0plus.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm1.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm1.h
index 0ed678e3b..0ed678e3b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm1.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm1.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm23.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm23.h
index acbc5dfea..acbc5dfea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm23.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm23.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm3.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm3.h
index 74bff64be..74bff64be 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm3.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm3.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm33.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm33.h
index 6cd2db77f..6cd2db77f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm33.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm33.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm4.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm4.h
index 7d5687353..7d5687353 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm4.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm4.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm7.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm7.h
index a14dc623b..a14dc623b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_cm7.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_cm7.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_sc000.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_sc000.h
index 9b67c92f3..9b67c92f3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_sc000.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_sc000.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_sc300.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_sc300.h
index 3e8a47109..3e8a47109 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/core_sc300.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/core_sc300.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/mpu_armv7.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/mpu_armv7.h
index 01422033d..01422033d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/mpu_armv7.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/mpu_armv7.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/mpu_armv8.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/mpu_armv8.h
index 62571da5b..62571da5b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/mpu_armv8.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/mpu_armv8.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/tz_context.h b/ports/stm32f4/stm32cube/CMSIS/Core/Include/tz_context.h
index 0d09749f3..0d09749f3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Include/tz_context.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Include/tz_context.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Template/ARMv8-M/main_s.c b/ports/stm32f4/stm32cube/CMSIS/Core/Template/ARMv8-M/main_s.c
index 273607b25..273607b25 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Template/ARMv8-M/main_s.c
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Template/ARMv8-M/main_s.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Template/ARMv8-M/tz_context.c b/ports/stm32f4/stm32cube/CMSIS/Core/Template/ARMv8-M/tz_context.c
index e2e82942f..e2e82942f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core/Template/ARMv8-M/tz_context.c
+++ b/ports/stm32f4/stm32cube/CMSIS/Core/Template/ARMv8-M/tz_context.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_armcc.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_armcc.h
index 313d7435b..313d7435b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_armcc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_armcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_armclang.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_armclang.h
index 5883364c3..5883364c3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_armclang.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_armclang.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_compiler.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_compiler.h
index b00c6ba3e..b00c6ba3e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_compiler.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_compiler.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_cp15.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_cp15.h
index 891bec2ae..891bec2ae 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_cp15.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_cp15.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_gcc.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_gcc.h
index 4f464627a..4f464627a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_gcc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_gcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_iccarm.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_iccarm.h
index bb0248dc6..bb0248dc6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/cmsis_iccarm.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/cmsis_iccarm.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/core_ca.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/core_ca.h
index dbe9794d4..dbe9794d4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/core_ca.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/core_ca.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/irq_ctrl.h b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/irq_ctrl.h
index b171ef0ad..b171ef0ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Include/irq_ctrl.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Include/irq_ctrl.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Source/irq_ctrl_gic.c b/ports/stm32f4/stm32cube/CMSIS/Core_A/Source/irq_ctrl_gic.c
index 25d135915..25d135915 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Core_A/Source/irq_ctrl_gic.c
+++ b/ports/stm32f4/stm32cube/CMSIS/Core_A/Source/irq_ctrl_gic.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/arr_desc/arr_desc.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/arr_desc/arr_desc.h
index 7995489a4..7995489a4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/arr_desc/arr_desc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/arr_desc/arr_desc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest.h
index ad48adc3c..ad48adc3c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_cycle.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_cycle.h
index d1b4db549..d1b4db549 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_cycle.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_cycle.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_define.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_define.h
index 13ad0fb16..13ad0fb16 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_define.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_define.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_fw.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_fw.h
index c655cfd20..c655cfd20 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_fw.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_fw.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group.h
index de4792029..de4792029 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_call.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_call.h
index 6b6095845..6b6095845 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_call.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_call.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_define.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_define.h
index 673a287d0..673a287d0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_define.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_group_define.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_pf.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_pf.h
index 6e55d4094..6e55d4094 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_pf.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_pf.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_systick.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_systick.h
index ec3e31720..ec3e31720 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_systick.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_systick.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test.h
index 397c562a1..397c562a1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_call.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_call.h
index 2040370a3..2040370a3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_call.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_call.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_define.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_define.h
index de302511c..de302511c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_define.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_define.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_ret.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_ret.h
index e8d80f3fc..e8d80f3fc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_ret.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_test_ret.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_util.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_util.h
index 3dec6ea65..3dec6ea65 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_util.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/jtest_util.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/opt_arg.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/opt_arg.h
index 94bf0e0de..94bf0e0de 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/opt_arg.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/opt_arg.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/pp_narg.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/pp_narg.h
index 48103c4cc..48103c4cc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/pp_narg.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/pp_narg.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/splice.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/splice.h
index e31242025..e31242025 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/splice.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/opt_arg/splice.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/util/util.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/util/util.h
index 4a7ca9ce4..4a7ca9ce4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/util/util.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/inc/util/util.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_cycle.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_cycle.c
index d58518bd9..d58518bd9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_cycle.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_cycle.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_dump_str_segments.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_dump_str_segments.c
index b546746bc..b546746bc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_dump_str_segments.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_dump_str_segments.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_fw.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_fw.c
index 9d4a583de..9d4a583de 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_fw.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_fw.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_trigger_action.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_trigger_action.c
index ca9e43c61..ca9e43c61 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_trigger_action.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/JTest/src/jtest_trigger_action.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/all_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/all_tests.h
index 4b2b935a4..4b2b935a4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/all_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/all_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_templates.h
index 5b6b294ef..5b6b294ef 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_data.h
index b387e0ffa..b387e0ffa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_group.h
index 98b7e3e52..98b7e3e52 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_tests.h
index 1b52999ed..1b52999ed 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/basic_math_tests/basic_math_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_templates.h
index a9c550bf2..a9c550bf2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_data.h
index e6438ec1a..e6438ec1a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_group.h
index 6665c9242..6665c9242 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_tests.h
index e6709f31a..e6709f31a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/complex_math_tests/complex_math_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_templates.h
index 6e4d08eaf..6e4d08eaf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_data.h
index e194e90da..e194e90da 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_group.h
index 88d8e479c..88d8e479c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_tests.h
index 389ffe5bd..389ffe5bd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/controller_tests/controller_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_templates.h
index 2ceb450a1..2ceb450a1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_data.h
index 493dc594f..493dc594f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_group.h
index ecde80d4a..ecde80d4a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/fast_math_tests/fast_math_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_templates.h
index 5c47f37a6..5c47f37a6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_data.h
index 7df698a18..7df698a18 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_group.h
index 6e2f638b1..6e2f638b1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_tests.h
index 3f7e0332a..3f7e0332a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/filtering_tests/filtering_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_templates.h
index b8261c50c..b8261c50c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_data.h
index 292487360..292487360 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_group.h
index 787b71590..787b71590 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/intrinsics_tests/intrinsics_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/math_helper.h
index 12f8c4c66..12f8c4c66 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_templates.h
index b48dbc1d2..b48dbc1d2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_data.h
index f96cc156c..f96cc156c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_group.h
index 3c92eb1fb..3c92eb1fb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_tests.h
index 3d0ed9c1c..3d0ed9c1c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/matrix_tests/matrix_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h
index de96f8804..de96f8804 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h
index 2dfcc97c9..2dfcc97c9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h
index 133cfeaca..133cfeaca 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h
index 489d2a749..489d2a749 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_templates.h
index 9ca4874fa..9ca4874fa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_data.h
index 52b6d7756..52b6d7756 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_group.h
index 5a50ae1b9..5a50ae1b9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_tests.h
index 66cc53808..66cc53808 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/support_tests/support_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/template.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/template.h
index 15d0b79e2..15d0b79e2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/template.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/template.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/test_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/test_templates.h
index 69c3488a9..69c3488a9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/test_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/templates/test_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_templates.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_templates.h
index abe75f9a5..abe75f9a5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_templates.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_templates.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_data.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_data.h
index d80c8a223..d80c8a223 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_group.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_group.h
index 4720efc5e..4720efc5e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_group.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_test_group.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_tests.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_tests.h
index 773b6f2d1..773b6f2d1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_tests.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/transform_tests/transform_tests.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/type_abbrev.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/type_abbrev.h
index f59f921f0..f59f921f0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/type_abbrev.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/type_abbrev.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/Retarget.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/Retarget.c
index 1557e71f2..1557e71f2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/Retarget.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/Retarget.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv6-m.s b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv6-m.s
index e9731e338..e9731e338 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv6-m.s
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv6-m.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv7-m.s b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv7-m.s
index 2b00ab959..2b00ab959 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv7-m.s
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCC/startup_armv7-m.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv6-m.S b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv6-m.S
index 3d182682b..3d182682b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv6-m.S
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv6-m.S
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv7-m.S b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv7-m.S
index 4bdb5496a..4bdb5496a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv7-m.S
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/ARMCLANG/startup_armv7-m.S
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/Retarget.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/Retarget.c
index 876ce8c2f..876ce8c2f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/Retarget.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/Retarget.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv6-m.S b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv6-m.S
index a5e14f1a2..a5e14f1a2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv6-m.S
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv6-m.S
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv7-m.S b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv7-m.S
index 35b388c8e..35b388c8e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv7-m.S
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/GCC/startup_armv7-m.S
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/startup_generic.S b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/startup_generic.S
index 6d68355da..6d68355da 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/startup_generic.S
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/startup_generic.S
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM0.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM0.c
index 177fc8372..177fc8372 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM0.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM0.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM23.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM23.c
index 1807ce7f2..1807ce7f2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM23.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM23.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM3.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM3.c
index b07219211..b07219211 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM3.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM3.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM33.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM33.c
index d232877e1..d232877e1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM33.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM33.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM4.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM4.c
index 9ba60fa10..9ba60fa10 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM4.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM4.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM7.c
index b5045f08d..b5045f08d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMCM7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC000.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC000.c
index 74bf4e64f..74bf4e64f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC000.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC000.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC300.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC300.c
index 5aafb1c95..5aafb1c95 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC300.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMSC300.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MBL.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MBL.c
index 7e652c6a8..7e652c6a8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MBL.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MBL.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MML.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MML.c
index 451a53329..451a53329 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MML.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_ARMv8MML.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_generic.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_generic.c
index 4db5f7624..4db5f7624 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_generic.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/platform/system_generic.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/all_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/all_tests.c
index aaa4524e8..aaa4524e8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/all_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/all_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/abs_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/abs_tests.c
index a2dda4da3..a2dda4da3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/abs_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/abs_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/add_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/add_tests.c
index 85a018dd9..85a018dd9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/add_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/add_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_common_data.c
index 45c2167b9..45c2167b9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_group.c
index c1ea8ba55..c1ea8ba55 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/basic_math_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/dot_prod_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/dot_prod_tests.c
index e92d6e760..e92d6e760 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/dot_prod_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/dot_prod_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/mult_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/mult_tests.c
index d735ade09..d735ade09 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/mult_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/mult_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/negate_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/negate_tests.c
index 4b96dc2cf..4b96dc2cf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/negate_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/negate_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/offset_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/offset_tests.c
index f95e52300..f95e52300 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/offset_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/offset_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/scale_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/scale_tests.c
index 09fda86ff..09fda86ff 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/scale_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/scale_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/shift_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/shift_tests.c
index c3cd5476b..c3cd5476b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/shift_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/shift_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/sub_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/sub_tests.c
index e52e73bd0..e52e73bd0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/sub_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/basic_math_tests/sub_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c
index 24b5cf9a6..24b5cf9a6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c
index d9b5bfa4c..d9b5bfa4c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c
index 55e9541ed..55e9541ed 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c
index b06e35955..b06e35955 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c
index d2cabd90f..d2cabd90f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c
index a06f1653f..a06f1653f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c
index d158bbf76..d158bbf76 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c
index 1be8a83b3..1be8a83b3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_common_data.c
index e59129380..e59129380 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_group.c
index 994dd0f87..994dd0f87 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/controller_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_reset_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_reset_tests.c
index af534c007..af534c007 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_reset_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_reset_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_tests.c
index 09fab0aba..09fab0aba 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/pid_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/sin_cos_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/sin_cos_tests.c
index 06be05f85..06be05f85 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/sin_cos_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/controller_tests/sin_cos_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests.c
index 7b259c91b..7b259c91b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests_common_data.c
index 01dda76f8..01dda76f8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/fast_math_tests/fast_math_tests_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/biquad_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/biquad_tests.c
index a6837f773..a6837f773 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/biquad_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/biquad_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/conv_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/conv_tests.c
index fc4581926..fc4581926 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/conv_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/conv_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/correlate_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/correlate_tests.c
index b00c7cce3..b00c7cce3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/correlate_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/correlate_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_common_data.c
index 49c4eb7db..49c4eb7db 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_group.c
index 7132556a3..7132556a3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/filtering_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/fir_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/fir_tests.c
index 14925d79e..14925d79e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/fir_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/fir_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/iir_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/iir_tests.c
index 1d4a0ac4a..1d4a0ac4a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/iir_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/iir_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/lms_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/lms_tests.c
index deadd7cda..deadd7cda 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/lms_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/filtering_tests/lms_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests.c
index 360f6282d..360f6282d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests_common_data.c
index 8e9c364b9..8e9c364b9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/intrinsics_tests/intrinsics_tests_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/main.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/main.c
index 8dd4b4061..8dd4b4061 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/main.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/main.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/math_helper.c
index 35925c853..35925c853 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_add_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_add_tests.c
index e9d1dcf74..e9d1dcf74 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_add_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_add_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_cmplx_mult_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_cmplx_mult_tests.c
index 43bc3c05b..43bc3c05b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_cmplx_mult_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_cmplx_mult_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_init_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_init_tests.c
index 67d019037..67d019037 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_init_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_init_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_inverse_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_inverse_tests.c
index 4ad4cef82..4ad4cef82 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_inverse_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_inverse_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_fast_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_fast_tests.c
index 7cdf71b84..7cdf71b84 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_fast_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_fast_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_tests.c
index f3230e06c..f3230e06c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_mult_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_scale_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_scale_tests.c
index cf0a1ddef..cf0a1ddef 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_scale_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_scale_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_sub_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_sub_tests.c
index 137e9cd7a..137e9cd7a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_sub_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_sub_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_trans_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_trans_tests.c
index 8f238f8e6..8f238f8e6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_trans_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/mat_trans_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_common_data.c
index 039489282..039489282 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_group.c
index d36d820f1..d36d820f1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/matrix_tests/matrix_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/max_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/max_tests.c
index 7e4f6f35e..7e4f6f35e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/max_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/max_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/mean_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/mean_tests.c
index ded6d2804..ded6d2804 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/mean_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/mean_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/min_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/min_tests.c
index 2eed629fa..2eed629fa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/min_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/min_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/power_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/power_tests.c
index fae2351a3..fae2351a3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/power_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/power_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/rms_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/rms_tests.c
index 46d8e526b..46d8e526b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/rms_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/rms_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_common_data.c
index 18eac07f6..18eac07f6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_group.c
index 41dcf9a2d..41dcf9a2d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/statistics_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/std_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/std_tests.c
index 2d30a34be..2d30a34be 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/std_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/std_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/var_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/var_tests.c
index 41f8cd28e..41f8cd28e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/var_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/statistics_tests/var_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/copy_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/copy_tests.c
index 63d58ff10..63d58ff10 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/copy_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/copy_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/fill_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/fill_tests.c
index 0831b75dd..0831b75dd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/fill_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/fill_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_common_data.c
index da21ba965..da21ba965 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_group.c
index 714f75c6d..714f75c6d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/support_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/x_to_y_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/x_to_y_tests.c
index 1d4107ba6..1d4107ba6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/x_to_y_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/support_tests/x_to_y_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_family_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_family_tests.c
index 9fb8834d7..9fb8834d7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_family_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_family_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_tests.c
index 2a4a98d22..2a4a98d22 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/cfft_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/dct4_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/dct4_tests.c
index f55e7b31c..f55e7b31c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/dct4_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/dct4_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_fast_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_fast_tests.c
index 1b4ece2c0..1b4ece2c0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_fast_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_fast_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_tests.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_tests.c
index 092525c31..092525c31 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_tests.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/rfft_tests.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_test_group.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_test_group.c
index 93e1e62d8..93e1e62d8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_test_group.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_test_group.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_tests_common_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_tests_common_data.c
index 4a04721d1..4a04721d1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_tests_common_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/transform_tests/transform_tests_common_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/inc/ref.h b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/inc/ref.h
index 3a6e6df70..3a6e6df70 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/inc/ref.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/inc/ref.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/abs.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/abs.c
index 9aba7d119..9aba7d119 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/abs.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/abs.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/add.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/add.c
index 75976aa5f..75976aa5f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/add.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/add.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/dot_prod.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/dot_prod.c
index 3fa3c82b5..3fa3c82b5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/dot_prod.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/dot_prod.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/mult.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/mult.c
index b14d9073a..b14d9073a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/mult.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/mult.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/negate.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/negate.c
index 7ee129962..7ee129962 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/negate.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/negate.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/offset.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/offset.c
index 7493ed167..7493ed167 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/offset.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/offset.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/scale.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/scale.c
index 065079f96..065079f96 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/scale.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/scale.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/shift.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/shift.c
index 7d8a049b0..7d8a049b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/shift.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/shift.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/sub.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/sub.c
index 996459b48..996459b48 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/sub.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/BasicMathFunctions/sub.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_conj.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_conj.c
index 00ca7d345..00ca7d345 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_conj.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_conj.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_dot_prod.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_dot_prod.c
index 22830ce3f..22830ce3f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_dot_prod.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_dot_prod.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag.c
index 1c2ddc87c..1c2ddc87c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag_squared.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag_squared.c
index 6dd868199..6dd868199 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag_squared.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mag_squared.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_cmplx.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_cmplx.c
index 61ac49c1f..61ac49c1f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_cmplx.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_cmplx.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_real.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_real.c
index c273fd398..c273fd398 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_real.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ComplexMathFunctions/cmplx_mult_real.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/pid.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/pid.c
index 652991e0a..652991e0a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/pid.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/pid.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/sin_cos.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/sin_cos.c
index 3dd3955c7..3dd3955c7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/sin_cos.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/ControllerFunctions/sin_cos.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/cos.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/cos.c
index 245942f42..245942f42 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/cos.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/cos.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sin.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sin.c
index ecd4aa0c6..ecd4aa0c6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sin.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sin.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sqrt.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sqrt.c
index 30b42ee52..30b42ee52 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sqrt.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FastMathFunctions/sqrt.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/biquad.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/biquad.c
index c340debd9..c340debd9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/biquad.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/biquad.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/conv.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/conv.c
index b10c8741d..b10c8741d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/conv.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/conv.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/correlate.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/correlate.c
index 9ce170cec..9ce170cec 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/correlate.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/correlate.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir.c
index 8a7a90c39..8a7a90c39 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_decimate.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_decimate.c
index 9ef1e5e61..9ef1e5e61 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_decimate.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_decimate.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_interpolate.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_interpolate.c
index 4cb52ebe7..4cb52ebe7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_interpolate.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_interpolate.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_lattice.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_lattice.c
index b7178a74b..b7178a74b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_lattice.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_lattice.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_sparse.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_sparse.c
index 11e79f900..11e79f900 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_sparse.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/fir_sparse.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/iir_lattice.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/iir_lattice.c
index 7a0c91f63..7a0c91f63 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/iir_lattice.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/iir_lattice.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/lms.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/lms.c
index 2b7f3def4..2b7f3def4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/lms.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/FilteringFunctions/lms.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/mat_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/mat_helper.c
index ee2be4ef4..ee2be4ef4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/mat_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/mat_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/ref_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/ref_helper.c
index c749daf45..c749daf45 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/ref_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/HelperFunctions/ref_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/Intrinsics/intrinsics.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/Intrinsics/intrinsics.c
index ca2c0e0a8..ca2c0e0a8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/Intrinsics/intrinsics.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/Intrinsics/intrinsics.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_add.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_add.c
index 7275b7a9c..7275b7a9c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_add.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_add.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_cmplx_mult.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_cmplx_mult.c
index c1e3bffac..c1e3bffac 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_cmplx_mult.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_cmplx_mult.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_inverse.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_inverse.c
index 4886bcc9b..4886bcc9b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_inverse.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_inverse.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_mult.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_mult.c
index daffce6ea..daffce6ea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_mult.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_mult.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_scale.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_scale.c
index 1b2a37072..1b2a37072 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_scale.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_scale.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_sub.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_sub.c
index 048d157e5..048d157e5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_sub.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_sub.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_trans.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_trans.c
index b4fed2fe2..b4fed2fe2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_trans.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/MatrixFunctions/mat_trans.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/max.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/max.c
index a4739d704..a4739d704 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/max.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/max.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/mean.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/mean.c
index 33d4a7031..33d4a7031 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/mean.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/mean.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/min.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/min.c
index 28c594981..28c594981 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/min.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/min.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/power.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/power.c
index 6160bfeeb..6160bfeeb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/power.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/power.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/rms.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/rms.c
index 7b9116384..7b9116384 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/rms.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/rms.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/std.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/std.c
index 148b5c700..148b5c700 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/std.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/std.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/var.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/var.c
index 0dfb01589..0dfb01589 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/var.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/StatisticsFunctions/var.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/copy.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/copy.c
index b8ffd28fa..b8ffd28fa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/copy.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/copy.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fill.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fill.c
index e9dcd525c..e9dcd525c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fill.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fill.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_fixed.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_fixed.c
index f77c3ff8b..f77c3ff8b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_fixed.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_fixed.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_float.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_float.c
index b85adb7f8..b85adb7f8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_float.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/fixed_to_float.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/float_to_fixed.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/float_to_fixed.c
index e94df7d9d..e94df7d9d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/float_to_fixed.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/SupportFunctions/float_to_fixed.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/bitreversal.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/bitreversal.c
index 1f2be89fd..1f2be89fd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/bitreversal.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/bitreversal.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/cfft.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/cfft.c
index 136479904..136479904 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/cfft.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/cfft.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/dct4.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/dct4.c
index 60bbb1ab7..60bbb1ab7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/dct4.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/dct4.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/rfft.c b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/rfft.c
index 9be22d048..9be22d048 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/rfft.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/src/TransformFunctions/rfft.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example_f32.c
index 1d6241931..1d6241931 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example_f32.c
index 8af04b8c0..8af04b8c0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.c
index 4b0ee1f67..4b0ee1f67 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.h
index 46b0af3ad..46b0af3ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_convolution_example/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example_f32.c
index 21966a016..21966a016 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_data.c
index b5159e5de..b5159e5de 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example_f32.c
index 9e36b2bf7..9e36b2bf7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_data.c
index 283a25e25..283a25e25 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example_f32.c
index 333d2300b..333d2300b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.c
index 4b0ee1f67..4b0ee1f67 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.h
index 46b0af3ad..46b0af3ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_fir_example/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_data.c
index ffb0ff318..ffb0ff318 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example_q31.c
index 663b0467f..663b0467f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.c
index 4b0ee1f67..4b0ee1f67 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.h
index 46b0af3ad..46b0af3ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_data.c
index 5a53ec6d2..5a53ec6d2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example_f32.c
index 4da9e59e1..4da9e59e1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.c
index 4b0ee1f67..4b0ee1f67 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.h
index 46b0af3ad..46b0af3ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example_f32.c
index 078b54724..078b54724 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.c
index 4b0ee1f67..4b0ee1f67 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.h
index 46b0af3ad..46b0af3ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_matrix_example/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_data.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_data.c
index ddb1278e8..ddb1278e8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_data.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_data.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example_f32.c
index ae25ce91c..ae25ce91c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.c
index 4b0ee1f67..4b0ee1f67 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.h
index 46b0af3ad..46b0af3ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/math_helper.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example_f32.c
index 9e65b2c19..9e65b2c19 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example_f32.c
index b067a846c..b067a846c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Include/arm_common_tables.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Include/arm_common_tables.h
index dfea7460e..dfea7460e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Include/arm_common_tables.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Include/arm_common_tables.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Include/arm_const_structs.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Include/arm_const_structs.h
index 80a3e8bbe..80a3e8bbe 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Include/arm_const_structs.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Include/arm_const_structs.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Include/arm_math.h b/ports/stm32f4/stm32cube/CMSIS/DSP/Include/arm_math.h
index ea9dd26aa..ea9dd26aa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Include/arm_math.h
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Include/arm_math.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_f32.c
index f88ef95e0..f88ef95e0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q15.c
index ec47fff0b..ec47fff0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q31.c
index 2733f51fd..2733f51fd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q7.c
index d0acbfc24..d0acbfc24 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_abs_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_f32.c
index 78feb6481..78feb6481 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q15.c
index 80a523fde..80a523fde 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q31.c
index c008bccce..c008bccce 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q7.c
index ab4e7856b..ab4e7856b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_add_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_f32.c
index 0cd0afc46..0cd0afc46 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q15.c
index dec4ec5fa..dec4ec5fa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q31.c
index 67ae8874a..67ae8874a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q7.c
index 487efe397..487efe397 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_dot_prod_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_f32.c
index e4a9ef2db..e4a9ef2db 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q15.c
index 8e20963b3..8e20963b3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q31.c
index c302b0166..c302b0166 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q7.c
index d8a2f8a15..d8a2f8a15 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_mult_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_f32.c
index e39624c37..e39624c37 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q15.c
index 9624160f9..9624160f9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q31.c
index 4a5a58d7b..4a5a58d7b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q7.c
index d72c31714..d72c31714 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_negate_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_f32.c
index ebc20a47e..ebc20a47e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q15.c
index dab0b10d6..dab0b10d6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q31.c
index 655426e52..655426e52 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q7.c
index 5de624126..5de624126 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_offset_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_f32.c
index c90c03783..c90c03783 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q15.c
index 9d5727db5..9d5727db5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q31.c
index e89524d7e..e89524d7e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q7.c
index 6cf1bbb58..6cf1bbb58 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_scale_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q15.c
index d2cd03779..d2cd03779 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q31.c
index 7e728d4ed..7e728d4ed 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q7.c
index fd508b47b..fd508b47b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_shift_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_f32.c
index 74a2944d1..74a2944d1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q15.c
index 17942ebfd..17942ebfd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q31.c
index 72b8597f4..72b8597f4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q7.c
index d211f4054..d211f4054 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/BasicMathFunctions/arm_sub_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/CommonTables/arm_common_tables.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/CommonTables/arm_common_tables.c
index 1f8f589b0..1f8f589b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/CommonTables/arm_common_tables.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/CommonTables/arm_common_tables.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/CommonTables/arm_const_structs.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/CommonTables/arm_const_structs.c
index 4f412623f..4f412623f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/CommonTables/arm_const_structs.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/CommonTables/arm_const_structs.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c
index cfb6f1f94..cfb6f1f94 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c
index 79502297e..79502297e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c
index 709ce0e03..709ce0e03 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c
index bfc352b7b..bfc352b7b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c
index 9e23a0123..9e23a0123 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c
index 6eb5b6e5b..6eb5b6e5b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c
index 95aaf1eea..95aaf1eea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c
index 03d9b2aed..03d9b2aed 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c
index 830ecb9ba..830ecb9ba 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c
index 59127a229..59127a229 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c
index 3f740c39e..3f740c39e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c
index c2b2c5005..c2b2c5005 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c
index 3717591e8..3717591e8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c
index 2869837d2..2869837d2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c
index b01c4f675..b01c4f675 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c
index 8c7ca313b..8c7ca313b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c
index 340d8520d..340d8520d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c
index 19fc55bbe..19fc55bbe 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_f32.c
index f75d61f0b..f75d61f0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q15.c
index 61049cfb0..61049cfb0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q31.c
index 17b3b094e..17b3b094e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_f32.c
index 318ec8947..318ec8947 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q15.c
index 93c0e7c60..93c0e7c60 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q31.c
index 4c5b14e33..4c5b14e33 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_pid_reset_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_f32.c
index 7ec1b5392..7ec1b5392 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_q31.c
index d66183014..d66183014 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/ControllerFunctions/arm_sin_cos_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_cos_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_cos_f32.c
index e604b3c6b..e604b3c6b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_cos_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_cos_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q15.c
index 7fa2e187c..7fa2e187c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q31.c
index fde5368bc..fde5368bc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_cos_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sin_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sin_f32.c
index ce8b9b9bb..ce8b9b9bb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sin_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sin_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q15.c
index 7c8f627b5..7c8f627b5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q31.c
index 8d3c7acde..8d3c7acde 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sin_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q15.c
index 8487ed312..8487ed312 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q31.c
index 0deea04d7..0deea04d7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FastMathFunctions/arm_sqrt_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c
index 8f92496e3..8f92496e3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c
index c77cc8e4e..c77cc8e4e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c
index 0ffb29ee7..0ffb29ee7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c
index ab517d886..ab517d886 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c
index 00dbae1f7..00dbae1f7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c
index 35ceed4a0..35ceed4a0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c
index 2b3243d7b..2b3243d7b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c
index 5c60e4a68..5c60e4a68 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c
index 382b74444..382b74444 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c
index 4ca3f85af..4ca3f85af 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c
index c5a81d459..c5a81d459 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c
index aad9fbb5e..aad9fbb5e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c
index 180179971..180179971 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c
index 3d0a50811..3d0a50811 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c
index b7e935917..b7e935917 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c
index 4940ec99e..4940ec99e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_f32.c
index 9ce5bf020..9ce5bf020 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_opt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_opt_q15.c
index c6e05b8d7..c6e05b8d7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_opt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_opt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c
index 9625ae501..9625ae501 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q31.c
index ce3e33473..ce3e33473 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q15.c
index 1b203995b..1b203995b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q7.c
index 24d378b0b..24d378b0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_opt_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_f32.c
index f3b15b4a3..f3b15b4a3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c
index cf2d711a7..cf2d711a7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c
index bd43a9840..bd43a9840 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q31.c
index af3724dc1..af3724dc1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q15.c
index 44e368ebf..44e368ebf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q7.c
index 00dbef1a6..00dbef1a6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_opt_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q15.c
index 93864b78f..93864b78f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q31.c
index 94999b93b..94999b93b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q7.c
index d4e0679d8..d4e0679d8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q15.c
index 29513fd85..29513fd85 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q31.c
index 78e50f091..78e50f091 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q7.c
index 9e5a79b58..9e5a79b58 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_conv_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_f32.c
index 12031f185..12031f185 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c
index a1b0dbd80..a1b0dbd80 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c
index 383949d4c..383949d4c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q31.c
index 4a006aa89..4a006aa89 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q15.c
index 1eda71974..1eda71974 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c
index d4ff45eb7..d4ff45eb7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q15.c
index ce86db409..ce86db409 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q31.c
index 3d7d3d078..3d7d3d078 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q7.c
index dc5247f2e..dc5247f2e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_f32.c
index 160dc2a64..160dc2a64 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c
index 00b279086..00b279086 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c
index 3b3d817d8..3b3d817d8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_f32.c
index 20eb959c5..20eb959c5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q15.c
index 9094de574..9094de574 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q31.c
index a223a8e4f..a223a8e4f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q15.c
index 345aa9cf8..345aa9cf8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q31.c
index ed6744265..ed6744265 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_decimate_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_f32.c
index 61ec80a13..61ec80a13 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q15.c
index 212990c93..212990c93 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q31.c
index d37e13cb8..d37e13cb8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_f32.c
index 8bcb7365c..8bcb7365c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q15.c
index e4d6ef8ba..e4d6ef8ba 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q31.c
index 3308438b0..3308438b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q7.c
index 38cc7b401..38cc7b401 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_init_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_f32.c
index 66cfcf875..66cfcf875 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c
index 05fc37095..05fc37095 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c
index 3b3fb79cb..3b3fb79cb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c
index 03959c0b3..03959c0b3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q15.c
index dc0cb4bb4..dc0cb4bb4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q31.c
index 2d23b3771..2d23b3771 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_interpolate_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_f32.c
index 369c9e42e..369c9e42e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_f32.c
index 2e31a1590..2e31a1590 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q15.c
index ab5afd68e..ab5afd68e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q31.c
index 4dc30cced..4dc30cced 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q15.c
index 4c4e849f7..4c4e849f7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q31.c
index 8acfd34d5..8acfd34d5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_lattice_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q15.c
index e970a1099..e970a1099 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q31.c
index 4ca829534..4ca829534 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q7.c
index 23e60ad96..23e60ad96 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_f32.c
index bba2936a9..bba2936a9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_f32.c
index d6636790b..d6636790b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q15.c
index 08c2d0e97..08c2d0e97 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q31.c
index 4a9423204..4a9423204 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q7.c
index 58d670556..58d670556 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_init_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q15.c
index e17f2bd98..e17f2bd98 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q31.c
index e441716ca..e441716ca 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q7.c
index c1b4ce340..c1b4ce340 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_fir_sparse_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_f32.c
index 424be38e5..424be38e5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_f32.c
index 530c7ff97..530c7ff97 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q15.c
index 9b991f84c..9b991f84c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q31.c
index 1543206f9..1543206f9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q15.c
index 8f6806838..8f6806838 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q31.c
index a14dd7a45..a14dd7a45 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_iir_lattice_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_f32.c
index e5728b411..e5728b411 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_f32.c
index 9fc87f1fd..9fc87f1fd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q15.c
index 3a13f261c..3a13f261c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q31.c
index 5859c8433..5859c8433 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_f32.c
index 3fdc5a185..3fdc5a185 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_f32.c
index 820c5c88a..820c5c88a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q15.c
index 4bedbd962..4bedbd962 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q31.c
index a2402d191..a2402d191 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q15.c
index 70012ea07..70012ea07 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q31.c
index 9711738af..9711738af 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_norm_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q15.c
index 669029468..669029468 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q31.c
index 816e58953..816e58953 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/FilteringFunctions/arm_lms_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_f32.c
index 4a54049ef..4a54049ef 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q15.c
index 896e60c4f..896e60c4f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q31.c
index f230ad24c..f230ad24c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_add_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c
index bb8341e4e..bb8341e4e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c
index 5dee79c9e..5dee79c9e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c
index 65cbb663f..65cbb663f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_f32.c
index 783f7be58..783f7be58 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q15.c
index 08da19f4f..08da19f4f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q31.c
index 22e6f6d94..22e6f6d94 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f32.c
index b82373a39..b82373a39 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f64.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f64.c
index 54e598207..54e598207 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f64.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_inverse_f64.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_f32.c
index a038f2ff0..a038f2ff0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q15.c
index 8d720c7f2..8d720c7f2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q31.c
index 78b33ef59..78b33ef59 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_fast_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q15.c
index 3244f471c..3244f471c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q31.c
index 9bd2b9708..9bd2b9708 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_mult_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_f32.c
index dbc385a44..dbc385a44 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q15.c
index af664cac8..af664cac8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q31.c
index d190cf157..d190cf157 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_scale_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_f32.c
index 7c0b54e9a..7c0b54e9a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q15.c
index 28e659fc2..28e659fc2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q31.c
index 3bf5508d4..3bf5508d4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_sub_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_f32.c
index 84165ce2e..84165ce2e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q15.c
index 6ba090437..6ba090437 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q31.c
index 6f698e0e1..6f698e0e1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/MatrixFunctions/arm_mat_trans_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_f32.c
index a0a68acdf..a0a68acdf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q15.c
index 67d5e3463..67d5e3463 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q31.c
index 5d34bbd20..5d34bbd20 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q7.c
index 72f6e5eb6..72f6e5eb6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_max_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_f32.c
index 85a3b16fc..85a3b16fc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q15.c
index 7bf55c2ff..7bf55c2ff 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q31.c
index ea83ced8e..ea83ced8e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q7.c
index a7bdfb8d5..a7bdfb8d5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_mean_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_f32.c
index 858b0a26e..858b0a26e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q15.c
index fdc32b784..fdc32b784 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q31.c
index fc4c1556c..fc4c1556c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q7.c
index 50362e69e..50362e69e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_min_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_f32.c
index 1426735b9..1426735b9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q15.c
index 6d95f4dc8..6d95f4dc8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q31.c
index 16be24907..16be24907 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q7.c
index 24306cdcc..24306cdcc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_power_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_f32.c
index 8d1b7085e..8d1b7085e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q15.c
index d0e61ca31..d0e61ca31 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q31.c
index cb3c58e98..cb3c58e98 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_rms_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_std_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_std_f32.c
index 9750b88b8..9750b88b8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_std_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_std_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q15.c
index 2f2f52e14..2f2f52e14 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q31.c
index f02cbddeb..f02cbddeb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_std_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_var_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_var_f32.c
index c0f731de6..c0f731de6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_var_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_var_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q15.c
index 5ba61f701..5ba61f701 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q31.c
index 526c6cd8f..526c6cd8f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/StatisticsFunctions/arm_var_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_f32.c
index 1e2b5cfca..1e2b5cfca 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_q15.c
index 0d2fffbb8..0d2fffbb8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_q31.c
index 5bf893482..5bf893482 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_q7.c
index 5c737cd75..5c737cd75 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_copy_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_copy_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_f32.c
index be749c8df..be749c8df 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_q15.c
index 27eb42c75..27eb42c75 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_q31.c
index 397a7b5bf..397a7b5bf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_q7.c
index dffdf9703..dffdf9703 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_fill_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_fill_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q15.c
index 0aa20f1c5..0aa20f1c5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q31.c
index d17cc3ad5..d17cc3ad5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q7.c
index 6629a6977..6629a6977 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_float_to_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_float.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_float.c
index 48ef9477c..48ef9477c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_float.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_float.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q31.c
index bf139a817..bf139a817 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q7.c
index 7a45e5888..7a45e5888 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q15_to_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_float.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_float.c
index d2d750525..d2d750525 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_float.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_float.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q15.c
index c460fe78c..c460fe78c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q7.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q7.c
index f092bed14..f092bed14 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q31_to_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_float.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_float.c
index ace437fcf..ace437fcf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_float.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_float.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q15.c
index 53481943a..53481943a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q31.c
index 27d0952aa..27d0952aa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/SupportFunctions/arm_q7_to_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal.c
index cea48212a..cea48212a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal2.S b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal2.S
index e0a82dbc7..e0a82dbc7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal2.S
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal2.S
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_f32.c
index 4abb6f591..4abb6f591 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q15.c
index da76ddcc7..da76ddcc7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q31.c
index ff4ff9479..ff4ff9479 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_f32.c
index d35988df5..d35988df5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_f32.c
index fdfa63e1a..fdfa63e1a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q15.c
index 2646374d8..2646374d8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q31.c
index 56fff4b5e..56fff4b5e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q15.c
index 8880ab9c9..8880ab9c9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q31.c
index c9b15371c..c9b15371c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix2_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_f32.c
index d6f66aebf..d6f66aebf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_f32.c
index 14ea487ed..14ea487ed 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q15.c
index ed782366b..ed782366b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q31.c
index 6f11763c1..6f11763c1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q15.c
index f3451f740..f3451f740 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q31.c
index 95292e460..95292e460 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix8_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix8_f32.c
index b70ab388a..b70ab388a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix8_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix8_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_f32.c
index 231c79a3f..231c79a3f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_f32.c
index 9b39cd481..9b39cd481 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q15.c
index e57541c44..e57541c44 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q31.c
index 8156844d6..8156844d6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q15.c
index 918f0bd2c..918f0bd2c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q31.c
index 05697789f..05697789f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_dct4_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_f32.c
index a1bd81b1d..a1bd81b1d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_f32.c
index f7c52e959..f7c52e959 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_init_f32.c
index 2f8dfe6ad..2f8dfe6ad 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_fast_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_f32.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_f32.c
index bb3213a32..bb3213a32 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_f32.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_f32.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q15.c
index 0e097378a..0e097378a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q31.c
index 71ec4f53a..71ec4f53a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_init_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q15.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q15.c
index f85cf3023..f85cf3023 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q31.c b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q31.c
index 5386140fd..5386140fd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q31.c
+++ b/ports/stm32f4/stm32cube/CMSIS/DSP/Source/TransformFunctions/arm_rfft_q31.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xc.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xc.h
index fc1912147..fc1912147 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xe.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xe.h
index 8b4aa6fab..8b4aa6fab 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xe.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xe.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f405xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f405xx.h
index a54fd8e17..a54fd8e17 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f405xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f405xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h
index bcc3ca020..bcc3ca020 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410cx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f410cx.h
index c60968d77..c60968d77 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410cx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f410cx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410rx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f410rx.h
index 28a7aca9a..28a7aca9a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410rx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f410rx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410tx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f410tx.h
index 2bd5f17c1..2bd5f17c1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410tx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f410tx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f411xe.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f411xe.h
index 90cb861cd..90cb861cd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f411xe.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f411xe.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h
index e3ffc4993..e3ffc4993 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412rx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412rx.h
index 65171b393..65171b393 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412rx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412rx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412vx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412vx.h
index 739769b2b..739769b2b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412vx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412vx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412zx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412zx.h
index 955ddf651..955ddf651 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412zx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f412zx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f413xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f413xx.h
index be0aa24de..be0aa24de 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f413xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f413xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f415xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f415xx.h
index 9b4159692..9b4159692 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f415xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f415xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f417xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f417xx.h
index e80cce7ba..e80cce7ba 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f417xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f417xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f423xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f423xx.h
index a56580f7f..a56580f7f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f423xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f423xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f427xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f427xx.h
index bb64acc53..bb64acc53 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f427xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f427xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h
index ee206293a..ee206293a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f437xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f437xx.h
index 51e73ca7e..51e73ca7e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f437xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f437xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f439xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f439xx.h
index d36d122a3..d36d122a3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f439xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f439xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f446xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f446xx.h
index 875355519..875355519 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f446xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f446xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f469xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f469xx.h
index 83b498610..83b498610 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f469xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f469xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f479xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f479xx.h
index e311df23e..e311df23e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f479xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f479xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h
index d244b97af..d244b97af 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h
index 99cb936c6..99cb936c6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s
index 457838798..457838798 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s
index cf71ee356..cf71ee356 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s
index 0afddd07d..0afddd07d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s
index a7dea7cf7..a7dea7cf7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s
index b902f5096..b902f5096 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s
index 55b064958..55b064958 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s
index bfe2f48db..bfe2f48db 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s
index 376d7f584..376d7f584 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s
index e6ec19430..e6ec19430 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s
index 6c2889ad8..6c2889ad8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s
index 54a12a0ce..54a12a0ce 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s
index 1d431435f..1d431435f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s
index c83376b4b..c83376b4b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s
index 0959b624a..0959b624a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s
index b5d80d85c..b5d80d85c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s
index c1a5664a2..c1a5664a2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s
index 418965aef..418965aef 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s
index 6ba6ac7fc..6ba6ac7fc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s
index faefef0b9..faefef0b9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s
index 85721e828..85721e828 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s
index de75b4cce..de75b4cce 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s
index c6dfa08c6..c6dfa08c6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s
index 888ec221b..888ec221b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s
index 840043882..840043882 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s
index 51984897a..51984897a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s
index ea0e76a97..ea0e76a97 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s
index aeeeb22f6..aeeeb22f6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s
index 2f7c6aace..2f7c6aace 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s
index 9e0ac9be9..9e0ac9be9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s
index 174097f39..174097f39 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s
index 6079df95e..6079df95e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s
index 6890b9ec7..6890b9ec7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s
index 530664d9c..530664d9c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s
index b555a2a62..b555a2a62 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s
index cb5d22295..cb5d22295 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s
index c84b4992e..c84b4992e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s
index f40189a8b..f40189a8b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s
index 768e91730..768e91730 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s
index 4f9c42d2b..4f9c42d2b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s
index f7aa7ad26..f7aa7ad26 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s
index f6eab1d13..f6eab1d13 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s
index 9b1567752..9b1567752 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s
index 00d602de4..00d602de4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s
index b8b11248e..b8b11248e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s
index 785634aa4..785634aa4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s
index 37e40afec..37e40afec 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf
index 00923d2fe..00923d2fe 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf
index ce8cc4a27..ce8cc4a27 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf
index 1fda247e5..1fda247e5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf
index a0ccaa501..a0ccaa501 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf
index c22e8175e..c22e8175e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf
index 2129b072c..2129b072c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf
index c22e8175e..c22e8175e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf
index 2129b072c..2129b072c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf
index 6bd6ba4b0..6bd6ba4b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf
index d29aab078..d29aab078 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf
index 6bd6ba4b0..6bd6ba4b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf
index d29aab078..d29aab078 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf
index 6bd6ba4b0..6bd6ba4b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf
index d29aab078..d29aab078 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf
index 963a230a6..963a230a6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf
index 49e912f85..49e912f85 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf
index 9c9a954cf..9c9a954cf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf
index f730a5ef6..f730a5ef6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf
index 9c9a954cf..9c9a954cf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf
index f730a5ef6..f730a5ef6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf
index 9c9a954cf..9c9a954cf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf
index f730a5ef6..f730a5ef6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf
index 9c9a954cf..9c9a954cf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf
index f730a5ef6..f730a5ef6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf
index 831756c4e..831756c4e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf
index b29c620ac..b29c620ac 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf
index c22e8175e..c22e8175e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf
index 2129b072c..2129b072c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf
index c22e8175e..c22e8175e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf
index 2129b072c..2129b072c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf
index 831756c4e..831756c4e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf
index b29c620ac..b29c620ac 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf
index 64aaf0e0b..64aaf0e0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf
index 369bd0517..369bd0517 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf
index 64aaf0e0b..64aaf0e0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf
index 369bd0517..369bd0517 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf
index 64aaf0e0b..64aaf0e0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf
index 369bd0517..369bd0517 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf
index 64aaf0e0b..64aaf0e0b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf
index 369bd0517..369bd0517 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf
index 963a230a6..963a230a6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf
index 49e912f85..49e912f85 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf
index 8d4a1005e..8d4a1005e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf
index f1c2db68e..f1c2db68e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf
index 8d4a1005e..8d4a1005e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf
index f1c2db68e..f1c2db68e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s
index f987c5339..f987c5339 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s
index 68bf762b9..68bf762b9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s
index f4ca8320f..f4ca8320f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s
index 57738bbdc..57738bbdc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s
index 2c66d2542..2c66d2542 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s
index f301994f4..f301994f4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s
index 20c8d53c1..20c8d53c1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s
index b56c8f521..b56c8f521 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s
index dd77bf0cd..dd77bf0cd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s
index 14bb437fc..14bb437fc 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s
index 4312c16f9..4312c16f9 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s
index f065a9956..f065a9956 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s
index da2b6b692..da2b6b692 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s
index 932a34d2a..932a34d2a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s
index 0a087c423..0a087c423 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s
index a1c60ae46..a1c60ae46 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s
index c3e08b6aa..c3e08b6aa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s
index 242307e96..242307e96 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s
index 4ad01cf25..4ad01cf25 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s
index 59e3fef3d..59e3fef3d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s
index 85c7c51f6..85c7c51f6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s
index 408930508..408930508 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s
index 88eaddcf3..88eaddcf3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
index 3303f969d..3303f969d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
+++ b/ports/stm32f4/stm32cube/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_armcc.h b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_armcc.h
index 4d9d0645d..4d9d0645d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_armcc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_armcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_armclang.h b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_armclang.h
index 162a400ea..162a400ea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_armclang.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_armclang.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_compiler.h b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_compiler.h
index 94212eb87..94212eb87 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_compiler.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_compiler.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_gcc.h b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_gcc.h
index 2d9db15a5..2d9db15a5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_gcc.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_gcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_iccarm.h b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_iccarm.h
index 11c4af0eb..11c4af0eb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_iccarm.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_iccarm.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_version.h b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_version.h
index 660f612aa..660f612aa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/cmsis_version.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/cmsis_version.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_armv8mbl.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_armv8mbl.h
index 251e4ede3..251e4ede3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_armv8mbl.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_armv8mbl.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_armv8mml.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_armv8mml.h
index 3a3148ea3..3a3148ea3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_armv8mml.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_armv8mml.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm0.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm0.h
index f929bba07..f929bba07 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm0.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm0.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm0plus.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm0plus.h
index 424011ac3..424011ac3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm0plus.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm0plus.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm1.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm1.h
index 0ed678e3b..0ed678e3b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm1.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm1.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm23.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm23.h
index acbc5dfea..acbc5dfea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm23.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm23.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm3.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm3.h
index 74bff64be..74bff64be 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm3.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm3.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm33.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm33.h
index 6cd2db77f..6cd2db77f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm33.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm33.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm4.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm4.h
index 7d5687353..7d5687353 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm4.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm4.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm7.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm7.h
index a14dc623b..a14dc623b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_cm7.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_cm7.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_sc000.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_sc000.h
index 9b67c92f3..9b67c92f3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_sc000.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_sc000.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_sc300.h b/ports/stm32f4/stm32cube/CMSIS/Include/core_sc300.h
index 3e8a47109..3e8a47109 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/core_sc300.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/core_sc300.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/mpu_armv7.h b/ports/stm32f4/stm32cube/CMSIS/Include/mpu_armv7.h
index 01422033d..01422033d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/mpu_armv7.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/mpu_armv7.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/mpu_armv8.h b/ports/stm32f4/stm32cube/CMSIS/Include/mpu_armv8.h
index 62571da5b..62571da5b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/mpu_armv8.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/mpu_armv8.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/tz_context.h b/ports/stm32f4/stm32cube/CMSIS/Include/tz_context.h
index 0d09749f3..0d09749f3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Include/tz_context.h
+++ b/ports/stm32f4/stm32cube/CMSIS/Include/tz_context.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4b_math.lib b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
index b879e2284..b879e2284 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
+++ b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
index 178481eca..178481eca 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
+++ b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4l_math.lib b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
index 525e61577..525e61577 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
+++ b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
index 1d5fbe41d..1d5fbe41d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
+++ b/ports/stm32f4/stm32cube/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/Compiler/EventRecorderConf.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/Compiler/EventRecorderConf.h
index ddf354d37..ddf354d37 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/Compiler/EventRecorderConf.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/Compiler/EventRecorderConf.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM0/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM0/RTE_Components.h
index 0c062ade6..0c062ade6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM0/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM0/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM3/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM3/RTE_Components.h
index 62755a73e..62755a73e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM3/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM3/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM4_FP/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM4_FP/RTE_Components.h
index 835cb37ce..835cb37ce 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM4_FP/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM4_FP/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM7_SP/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM7_SP/RTE_Components.h
index d275f41c1..d275f41c1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM7_SP/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/RTE/_ARMCM7_SP/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10.cpp b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10.cpp
index 471899c92..471899c92 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10.cpp
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10.cpp
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_inputs.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_inputs.h
index c600c5a70..c600c5a70 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_inputs.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_inputs.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_parameter.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_parameter.h
index 09d0ca3b0..09d0ca3b0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_parameter.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_parameter.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_weights.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_weights.h
index 8d92d2121..8d92d2121 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_weights.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/cifar10/arm_nnexamples_cifar10_weights.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/Compiler/EventRecorderConf.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/Compiler/EventRecorderConf.h
index ddf354d37..ddf354d37 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/Compiler/EventRecorderConf.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/Compiler/EventRecorderConf.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM0/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM0/RTE_Components.h
index b3b30762d..b3b30762d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM0/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM0/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM3/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM3/RTE_Components.h
index 2df6879cb..2df6879cb 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM3/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM3/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM4_FP/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM4_FP/RTE_Components.h
index f29db078a..f29db078a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM4_FP/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM4_FP/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM7_SP/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM7_SP/RTE_Components.h
index 6cd8e76c8..6cd8e76c8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM7_SP/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/RTE/_ARMCM7_SP/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru.cpp b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru.cpp
index 340dc33aa..340dc33aa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru.cpp
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru.cpp
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru_test_data.h b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru_test_data.h
index 4fd2bb0cd..4fd2bb0cd 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru_test_data.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Examples/ARM/arm_nn_examples/gru/arm_nnexamples_gru_test_data.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Include/arm_nn_tables.h b/ports/stm32f4/stm32cube/CMSIS/NN/Include/arm_nn_tables.h
index d56d82c4d..d56d82c4d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Include/arm_nn_tables.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Include/arm_nn_tables.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Include/arm_nnfunctions.h b/ports/stm32f4/stm32cube/CMSIS/NN/Include/arm_nnfunctions.h
index c6ec83a45..c6ec83a45 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Include/arm_nnfunctions.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Include/arm_nnfunctions.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Include/arm_nnsupportfunctions.h b/ports/stm32f4/stm32cube/CMSIS/NN/Include/arm_nnsupportfunctions.h
index 846019042..846019042 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Include/arm_nnsupportfunctions.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Include/arm_nnsupportfunctions.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM0/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM0/RTE_Components.h
index 4459a748d..4459a748d 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM0/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM0/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM3/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM3/RTE_Components.h
index f12e4f306..f12e4f306 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM3/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM3/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM4_FP/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM4_FP/RTE_Components.h
index d4542f5c1..d4542f5c1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM4_FP/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM4_FP/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM7_SP/RTE_Components.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM7_SP/RTE_Components.h
index 97ef09a12..97ef09a12 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM7_SP/RTE_Components.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/RTE/_ARMCM7_SP/RTE_Components.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref.c
index 008970952..008970952 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref_nonsquare.c
index e355ebf2c..e355ebf2c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q15_ref_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref.c
index 560cd23a6..560cd23a6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref_nonsquare.c
index 1e2d19efa..1e2d19efa 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_convolve_HWC_q7_ref_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref.c
index 1672a4e9b..1672a4e9b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref_nonsquare.c
index 6ebd1f01f..6ebd1f01f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_depthwise_separable_conv_HWC_q7_ref_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_opt_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_opt_ref.c
index 09dd653e2..09dd653e2 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_opt_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_opt_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_ref.c
index 8fc74d41f..8fc74d41f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_mat_q7_vec_q15_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_opt_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_opt_ref.c
index 2118f99e7..2118f99e7 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_opt_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_opt_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_ref.c
index 99ab4d966..99ab4d966 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q15_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_opt_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_opt_ref.c
index 567f964a0..567f964a0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_opt_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_opt_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_ref.c
index f59f3db26..f59f3db26 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_fully_connected_q7_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_nn_mult_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_nn_mult_ref.c
index 2cc6b72b8..2cc6b72b8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_nn_mult_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_nn_mult_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_pool_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_pool_ref.c
index 9a4adb29a..9a4adb29a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_pool_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_pool_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_relu_ref.c b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_relu_ref.c
index 323fc1105..323fc1105 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_relu_ref.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/arm_relu_ref.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/fully_connected_testing_weights.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/fully_connected_testing_weights.h
index 74b79f87a..74b79f87a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/fully_connected_testing_weights.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/fully_connected_testing_weights.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/ref_functions.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/ref_functions.h
index 4a0647a9b..4a0647a9b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/ref_functions.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/Ref_Implementations/ref_functions.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.cpp b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.cpp
index 5cf72a2a0..5cf72a2a0 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.cpp
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.cpp
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.h b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.h
index 264b755a8..264b755a8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.h
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c
index 9c64e2ac5..9c64e2ac5 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c
index 1ca429fea..1ca429fea 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c
index 571d51c7c..571d51c7c 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c
index 013325c0f..013325c0f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c
index 2f4133cbf..2f4133cbf 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c
index 00b5aa520..00b5aa520 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c
index c9873c141..c9873c141 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c
index 027420224..027420224 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c
index 42bfb1fff..42bfb1fff 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c
index a92608665..a92608665 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c
index b426b924f..b426b924f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c
index 7b59d7915..7b59d7915 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c
index f2aa4a2f8..f2aa4a2f8 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c
index 68ebeb8f4..68ebeb8f4 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c
index 397f23342..397f23342 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c
index a4adc5dd1..a4adc5dd1 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c
index deef7c6a3..deef7c6a3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c
index 274696721..274696721 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c
index 7be156f51..7be156f51 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c
index c3e7cf235..c3e7cf235 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c
index f7a3915f6..f7a3915f6 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c
index d8efc044f..d8efc044f 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c
index e3d087412..e3d087412 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c
index 5a6045963..5a6045963 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c
index 3735c0499..3735c0499 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_nntables.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_nntables.c
index c28f1a612..c28f1a612 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_nntables.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_nntables.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_no_shift.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_no_shift.c
index 264e7608e..264e7608e 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_no_shift.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_no_shift.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_reordered_no_shift.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_reordered_no_shift.c
index 7d29aa4d3..7d29aa4d3 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_reordered_no_shift.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/NNSupportFunctions/arm_q7_to_q15_reordered_no_shift.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c
index b451f5e69..b451f5e69 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c
index abc27376a..abc27376a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c b/ports/stm32f4/stm32cube/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c
index a4e254820..a4e254820 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c
+++ b/ports/stm32f4/stm32cube/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS/Template/cmsis_os.h b/ports/stm32f4/stm32cube/CMSIS/RTOS/Template/cmsis_os.h
index 30068d35b..30068d35b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS/Template/cmsis_os.h
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS/Template/cmsis_os.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Include/cmsis_os2.h b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Include/cmsis_os2.h
index e0b602c79..e0b602c79 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Include/cmsis_os2.h
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Include/cmsis_os2.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Include/os_tick.h b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Include/os_tick.h
index 8f7cdf667..8f7cdf667 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Include/os_tick.h
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Include/os_tick.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Source/os_systick.c b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Source/os_systick.c
index 985a9d968..985a9d968 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Source/os_systick.c
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Source/os_systick.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Source/os_tick_gtim.c b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Source/os_tick_gtim.c
index 22cfa9308..22cfa9308 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Source/os_tick_gtim.c
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Source/os_tick_gtim.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Source/os_tick_ptim.c b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Source/os_tick_ptim.c
index e75ac3a3b..e75ac3a3b 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Source/os_tick_ptim.c
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Source/os_tick_ptim.c
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Template/cmsis_os.h b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Template/cmsis_os.h
index 376dbf70a..376dbf70a 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Template/cmsis_os.h
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Template/cmsis_os.h
diff --git a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Template/cmsis_os1.c b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Template/cmsis_os1.c
index de1650c47..de1650c47 100644
--- a/ports/stm32f4/cubeMXDrivers/CMSIS/RTOS2/Template/cmsis_os1.c
+++ b/ports/stm32f4/stm32cube/CMSIS/RTOS2/Template/cmsis_os1.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
index 889db8f18..889db8f18 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/Legacy/stm32f4xx_hal_can_legacy.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/Legacy/stm32f4xx_hal_can_legacy.h
index 7788f06c2..7788f06c2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/Legacy/stm32f4xx_hal_can_legacy.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/Legacy/stm32f4xx_hal_can_legacy.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32_assert_template.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32_assert_template.h
index 4711b65d8..4711b65d8 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32_assert_template.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32_assert_template.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h
index 5b800df7d..5b800df7d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc.h
index badeabc40..badeabc40 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h
index ed38931dc..ed38931dc 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_can.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_can.h
index 0611a6521..0611a6521 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_can.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_can.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cec.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cec.h
index 3519cbd86..3519cbd86 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cec.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cec.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_conf_template.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_conf_template.h
index 37c8780fa..37c8780fa 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_conf_template.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_conf_template.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cortex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cortex.h
index 95218cfbb..95218cfbb 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cortex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cortex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_crc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_crc.h
index bbd58a581..bbd58a581 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_crc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_crc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp.h
index 8251ebd25..8251ebd25 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp_ex.h
index f93a3b789..f93a3b789 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac.h
index fc9ce32ef..fc9ce32ef 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac_ex.h
index 4e9793a56..4e9793a56 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dac_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi.h
index 021f37e4e..021f37e4e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi_ex.h
index 9bc942dea..9bc942dea 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dcmi_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h
index e32e362dd..e32e362dd 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dfsdm.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dfsdm.h
index 09c6551e6..09c6551e6 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dfsdm.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dfsdm.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma.h
index 90dd292cc..90dd292cc 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma2d.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma2d.h
index 5bb7b6dfb..5bb7b6dfb 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma2d.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma2d.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma_ex.h
index 2e60aff2f..2e60aff2f 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dma_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dsi.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dsi.h
index df61c5e30..df61c5e30 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dsi.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_dsi.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_eth.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_eth.h
index a0b0ad320..a0b0ad320 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_eth.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_eth.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_exti.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_exti.h
index 24dccffee..24dccffee 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_exti.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_exti.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h
index b817f63b7..b817f63b7 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ex.h
index 4dbad6732..4dbad6732 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h
index 9fab0c98c..9fab0c98c 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash_ramfunc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c.h
index f0fd230e8..f0fd230e8 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c_ex.h
index 2be2c288e..2be2c288e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_fmpi2c_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio.h
index 5110d634b..5110d634b 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio_ex.h
index aa1e34d88..aa1e34d88 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_gpio_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash.h
index da6d5d92b..da6d5d92b 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash_ex.h
index e594b63b2..e594b63b2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hash_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hcd.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hcd.h
index 5f4cccdc5..5f4cccdc5 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hcd.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_hcd.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c.h
index 2f3f947c4..2f3f947c4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c_ex.h
index 6864d8351..6864d8351 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2c_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s.h
index 6530a5c2e..6530a5c2e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s_ex.h
index 19cd80618..19cd80618 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_i2s_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_irda.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_irda.h
index b30945e78..b30945e78 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_irda.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_irda.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_iwdg.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_iwdg.h
index ced1099f3..ced1099f3 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_iwdg.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_iwdg.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_lptim.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_lptim.h
index 39a816455..39a816455 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_lptim.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_lptim.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc.h
index a862f2cc8..a862f2cc8 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc_ex.h
index b46457fea..b46457fea 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_ltdc_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_mmc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_mmc.h
index 90a44befc..90a44befc 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_mmc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_mmc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nand.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nand.h
index e6aaabbb5..e6aaabbb5 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nand.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nand.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nor.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nor.h
index dcd25c505..dcd25c505 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nor.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_nor.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pccard.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pccard.h
index 41d7824e0..41d7824e0 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pccard.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pccard.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd.h
index 2db595c44..2db595c44 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd_ex.h
index 71e9a2c18..71e9a2c18 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pcd_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h
index 6f3bf7141..6f3bf7141 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h
index 10e017a10..10e017a10 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_pwr_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_qspi.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_qspi.h
index 4c5de584d..4c5de584d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_qspi.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_qspi.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h
index 36a639b45..36a639b45 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc_ex.h
index 0b8152b12..0b8152b12 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rng.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rng.h
index a7b1a5980..a7b1a5980 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rng.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rng.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc.h
index f5fcfdc6a..f5fcfdc6a 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc_ex.h
index 76859eeb2..76859eeb2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rtc_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai.h
index 16cbccfae..16cbccfae 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai_ex.h
index 3398fb2dd..3398fb2dd 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sai_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sd.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sd.h
index edf33c1a1..edf33c1a1 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sd.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sd.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sdram.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sdram.h
index 3dd78027a..3dd78027a 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sdram.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sdram.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smartcard.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smartcard.h
index d329ac85c..d329ac85c 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smartcard.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smartcard.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smbus.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smbus.h
index 0c80fd3ac..0c80fd3ac 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smbus.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_smbus.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spdifrx.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spdifrx.h
index 73e30d228..73e30d228 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spdifrx.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spdifrx.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h
index c220b2174..c220b2174 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sram.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sram.h
index 0c7b08dba..0c7b08dba 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sram.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_sram.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h
index 9f79ad9c7..9f79ad9c7 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h
index 69b4ca3f5..69b4ca3f5 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h
index bd47cfbd4..bd47cfbd4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_usart.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_usart.h
index fa2f1dd4a..fa2f1dd4a 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_usart.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_usart.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_wwdg.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_wwdg.h
index fbc628cff..fbc628cff 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_wwdg.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_wwdg.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_adc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_adc.h
index 0d5ccb24d..0d5ccb24d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_adc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_adc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h
index 66da28fe2..66da28fe2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_cortex.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_cortex.h
index cfa8fbe7a..cfa8fbe7a 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_cortex.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_cortex.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_crc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_crc.h
index 2d05b6794..2d05b6794 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_crc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_crc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dac.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dac.h
index 55eb09c12..55eb09c12 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dac.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dac.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h
index a1560d647..a1560d647 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma2d.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma2d.h
index 6864b54c4..6864b54c4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma2d.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma2d.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_exti.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_exti.h
index c816e266e..c816e266e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_exti.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_exti.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fmc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fmc.h
index 71e7c7425..71e7c7425 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fmc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fmc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fsmc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fsmc.h
index 12f3a14df..12f3a14df 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fsmc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_fsmc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h
index 3f1b3a1d6..3f1b3a1d6 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_i2c.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_i2c.h
index b173cc699..b173cc699 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_i2c.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_i2c.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_iwdg.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_iwdg.h
index 571135118..571135118 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_iwdg.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_iwdg.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_lptim.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_lptim.h
index 636e5fa4e..636e5fa4e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_lptim.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_lptim.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_pwr.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_pwr.h
index 03b8706e9..03b8706e9 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_pwr.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_pwr.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h
index 0cb40995e..0cb40995e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rcc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rng.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rng.h
index c142717b0..c142717b0 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rng.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rng.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rtc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rtc.h
index 1f57ce444..1f57ce444 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rtc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_rtc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_sdmmc.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_sdmmc.h
index 026da3c10..026da3c10 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_sdmmc.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_sdmmc.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h
index 13d1883af..13d1883af 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_spi.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_system.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_system.h
index cc7635e9f..cc7635e9f 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_system.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_system.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h
index fcdfd6e46..fcdfd6e46 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h
index c75c68f33..c75c68f33 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usart.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usb.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usb.h
index a1f31b3a6..a1f31b3a6 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usb.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_usb.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_utils.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_utils.h
index 60ea7070c..60ea7070c 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_utils.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_utils.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_wwdg.h b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_wwdg.h
index 9fed6aad0..9fed6aad0 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_wwdg.h
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_wwdg.h
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c
index 22497fbd2..22497fbd2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c
index eb6c2825d..eb6c2825d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c
index 5d30e09db..5d30e09db 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c
index a2ccfd5fd..a2ccfd5fd 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c
index 5d9f683ae..5d9f683ae 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c
index 2efb98640..2efb98640 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c
index 2c499e59e..2c499e59e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c
index cbcaa1ce3..cbcaa1ce3 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c
index c84f690d4..c84f690d4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c
index 850f80955..850f80955 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c
index db74acf83..db74acf83 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c
index 83dce62f4..83dce62f4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c
index 89ad9c76d..89ad9c76d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dfsdm.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dfsdm.c
index 3126cbdf1..3126cbdf1 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dfsdm.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dfsdm.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c
index 0a51f7e18..0a51f7e18 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c
index 8ca7ae713..8ca7ae713 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c
index 6e0737683..6e0737683 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c
index be4da6d8d..be4da6d8d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c
index dbaeb3eee..dbaeb3eee 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c
index a8699066d..a8699066d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c
index 5c601aeac..5c601aeac 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c
index 066aa5027..066aa5027 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c
index 12db458b5..12db458b5 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c
index f60c0df23..f60c0df23 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c
index ff996e7eb..ff996e7eb 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c
index 75b8fcdfc..75b8fcdfc 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c
index af5c07112..af5c07112 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c
index 792b2e58f..792b2e58f 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c
index 6d90fdcdd..6d90fdcdd 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c
index 38d555cb6..38d555cb6 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c
index ed5033200..ed5033200 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c
index fc7f6ae52..fc7f6ae52 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c
index abc960fb3..abc960fb3 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c
index 97b1475d1..97b1475d1 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c
index cb49dbf44..cb49dbf44 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_lptim.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_lptim.c
index 1d43bb83c..1d43bb83c 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_lptim.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_lptim.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c
index 6620eb601..6620eb601 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc_ex.c
index af7558746..af7558746 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_mmc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_mmc.c
index 28e8f0cd4..28e8f0cd4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_mmc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_mmc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c
index 67f658c0d..67f658c0d 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c
index 6a1fb91c3..6a1fb91c3 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c
index 34a009caf..34a009caf 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c
index 2f7d3e0ff..2f7d3e0ff 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c
index cc5081ffe..cc5081ffe 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c
index cd0a5bb5c..cd0a5bb5c 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c
index ba2ce59db..ba2ce59db 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c
index 0d26083a4..0d26083a4 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c
index 1fb07438a..1fb07438a 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c
index 7fe1db65a..7fe1db65a 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c
index 2b4e04ce9..2b4e04ce9 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c
index fca4240f6..fca4240f6 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c
index f7fe5f1a0..f7fe5f1a0 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c
index 5b25ed7b3..5b25ed7b3 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c
index 5d181e1a2..5d181e1a2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c
index d2e4483c2..d2e4483c2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c
index 9753e4e11..9753e4e11 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c
index da34f47a8..da34f47a8 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c
index 6b79f9ae2..6b79f9ae2 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smbus.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smbus.c
index 6e7c50881..6e7c50881 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smbus.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smbus.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c
index 1ba1c4d7e..1ba1c4d7e 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c
index fbe57f4ae..fbe57f4ae 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c
index 752056982..752056982 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c
index 99004f478..99004f478 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c
index fa2f8f134..fa2f8f134 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_alarm_template.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_alarm_template.c
index 8e197a19b..8e197a19b 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_alarm_template.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_alarm_template.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_wakeup_template.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_wakeup_template.c
index a047def22..a047def22 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_wakeup_template.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_rtc_wakeup_template.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_tim_template.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_tim_template.c
index 66f75d5ca..66f75d5ca 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_tim_template.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_timebase_tim_template.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c
index d7e2cf56f..d7e2cf56f 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c
index 655b80dca..655b80dca 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c
index 0c43ba766..0c43ba766 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c
index 8acb23167..8acb23167 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c
index 821b281e8..821b281e8 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dac.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dac.c
index ad37f274f..ad37f274f 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dac.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dac.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c
index e4cbae4c9..e4cbae4c9 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma2d.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma2d.c
index 9df5b49ff..9df5b49ff 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma2d.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma2d.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c
index 31d70ac68..31d70ac68 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c
index 2e4dadb32..2e4dadb32 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c
index 986813744..986813744 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c
index eba14b097..eba14b097 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c
index 125fb2ca1..125fb2ca1 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_lptim.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_lptim.c
index 2c05217ba..2c05217ba 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_lptim.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_lptim.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_pwr.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_pwr.c
index fe04bc44c..fe04bc44c 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_pwr.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_pwr.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c
index 37c130ae9..37c130ae9 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rng.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rng.c
index d31a5ed28..d31a5ed28 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rng.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rng.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rtc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rtc.c
index c6fa695a1..c6fa695a1 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rtc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rtc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c
index 2b3f06784..2b3f06784 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c
index 5d2902b46..5d2902b46 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c
index f99d29fdb..f99d29fdb 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c
index dab4fddf1..dab4fddf1 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c
index 9263fc318..9263fc318 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c
diff --git a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c
index ef05cfdff..ef05cfdff 100644
--- a/ports/stm32f4/cubeMXDrivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c
+++ b/ports/stm32f4/stm32cube/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c
diff --git a/ports/stm32f4/supervisor/port.c b/ports/stm32f4/supervisor/port.c
index 93a297d0f..8f594e83f 100644
--- a/ports/stm32f4/supervisor/port.c
+++ b/ports/stm32f4/supervisor/port.c
@@ -28,22 +28,161 @@
 #include "supervisor/port.h"
 #include "boards/board.h"
 
+#include "tick.h"
+//#include "shared-bindings/rtc/__init__.h"
+
 #include "stm32f4xx_hal.h"
 
-#define B1_Pin GPIO_PIN_13
-#define B1_GPIO_Port GPIOC
-#define USART_TX_Pin GPIO_PIN_2
-#define USART_TX_GPIO_Port GPIOA
-#define USART_RX_Pin GPIO_PIN_3
-#define USART_RX_GPIO_Port GPIOA
-#define LD2_Pin GPIO_PIN_5
-#define LD2_GPIO_Port GPIOA
-#define TMS_Pin GPIO_PIN_13
-#define TMS_GPIO_Port GPIOA
-#define TCK_Pin GPIO_PIN_14
-#define TCK_GPIO_Port GPIOA
+#define LED3_Pin GPIO_PIN_2
+#define LED3_GPIO_Port GPIOE
+#define LED4_Pin GPIO_PIN_3
+#define LED4_GPIO_Port GPIOE
+#define DFSDM_DATIN3_Pin GPIO_PIN_4
+#define DFSDM_DATIN3_GPIO_Port GPIOE
+#define A0_Pin GPIO_PIN_0
+#define A0_GPIO_Port GPIOF
+#define LCD_BLCTRL_Pin GPIO_PIN_5
+#define LCD_BLCTRL_GPIO_Port GPIOF
+#define QSPI_BK1_IO3_Pin GPIO_PIN_6
+#define QSPI_BK1_IO3_GPIO_Port GPIOF
+#define QSPI_BK1_IO2_Pin GPIO_PIN_7
+#define QSPI_BK1_IO2_GPIO_Port GPIOF
+#define QSPI_BK1_IO0_Pin GPIO_PIN_8
+#define QSPI_BK1_IO0_GPIO_Port GPIOF
+#define QSPI_BK1_IO1_Pin GPIO_PIN_9
+#define QSPI_BK1_IO1_GPIO_Port GPIOF
+#define STLK_MCO_Pin GPIO_PIN_0
+#define STLK_MCO_GPIO_Port GPIOH
+#define DFSDM_CKOUT_Pin GPIO_PIN_2
+#define DFSDM_CKOUT_GPIO_Port GPIOC
+#define JOY_SEL_Pin GPIO_PIN_0
+#define JOY_SEL_GPIO_Port GPIOA
+#define STLINK_RX_Pin GPIO_PIN_2
+#define STLINK_RX_GPIO_Port GPIOA
+#define STLINK_TX_Pin GPIO_PIN_3
+#define STLINK_TX_GPIO_Port GPIOA
+#define CODEC_I2S3_WS_Pin GPIO_PIN_4
+#define CODEC_I2S3_WS_GPIO_Port GPIOA
+#define DFSDM_DATIN0_Pin GPIO_PIN_1
+#define DFSDM_DATIN0_GPIO_Port GPIOB
+#define QSPI_CLK_Pin GPIO_PIN_2
+#define QSPI_CLK_GPIO_Port GPIOB
+#define EXT_RESET_Pin GPIO_PIN_11
+#define EXT_RESET_GPIO_Port GPIOF
+#define CTP_RST_Pin GPIO_PIN_12
+#define CTP_RST_GPIO_Port GPIOF
+#define JOY_RIGHT_Pin GPIO_PIN_14
+#define JOY_RIGHT_GPIO_Port GPIOF
+#define JOY_LEFT_Pin GPIO_PIN_15
+#define JOY_LEFT_GPIO_Port GPIOF
+#define JOY_UP_Pin GPIO_PIN_0
+#define JOY_UP_GPIO_Port GPIOG
+#define JOY_DOWN_Pin GPIO_PIN_1
+#define JOY_DOWN_GPIO_Port GPIOG
+#define D4_Pin GPIO_PIN_7
+#define D4_GPIO_Port GPIOE
+#define D5_Pin GPIO_PIN_8
+#define D5_GPIO_Port GPIOE
+#define D6_Pin GPIO_PIN_9
+#define D6_GPIO_Port GPIOE
+#define D7_Pin GPIO_PIN_10
+#define D7_GPIO_Port GPIOE
+#define D8_Pin GPIO_PIN_11
+#define D8_GPIO_Port GPIOE
+#define D9_Pin GPIO_PIN_12
+#define D9_GPIO_Port GPIOE
+#define D10_Pin GPIO_PIN_13
+#define D10_GPIO_Port GPIOE
+#define D11_Pin GPIO_PIN_14
+#define D11_GPIO_Port GPIOE
+#define D12_Pin GPIO_PIN_15
+#define D12_GPIO_Port GPIOE
+#define I2C2_SCL_Pin GPIO_PIN_10
+#define I2C2_SCL_GPIO_Port GPIOB
+#define M2_CKIN_Pin GPIO_PIN_11
+#define M2_CKIN_GPIO_Port GPIOB
+#define CODEC_I2S3_SCK_Pin GPIO_PIN_12
+#define CODEC_I2S3_SCK_GPIO_Port GPIOB
+#define D13_Pin GPIO_PIN_8
+#define D13_GPIO_Port GPIOD
+#define D14_Pin GPIO_PIN_9
+#define D14_GPIO_Port GPIOD
+#define D15_Pin GPIO_PIN_10
+#define D15_GPIO_Port GPIOD
+#define LCD_RESET_Pin GPIO_PIN_11
+#define LCD_RESET_GPIO_Port GPIOD
+#define D0_Pin GPIO_PIN_14
+#define D0_GPIO_Port GPIOD
+#define D1_Pin GPIO_PIN_15
+#define D1_GPIO_Port GPIOD
+#define CODEC_INT_Pin GPIO_PIN_2
+#define CODEC_INT_GPIO_Port GPIOG
+#define LCD_TE_Pin GPIO_PIN_4
+#define LCD_TE_GPIO_Port GPIOG
+#define CTP_INT_Pin GPIO_PIN_5
+#define CTP_INT_GPIO_Port GPIOG
+#define QSPI_BK1_NCS_Pin GPIO_PIN_6
+#define QSPI_BK1_NCS_GPIO_Port GPIOG
+#define USB_OTGFS_OVRCR_Pin GPIO_PIN_7
+#define USB_OTGFS_OVRCR_GPIO_Port GPIOG
+#define USB_OTGFS_PPWR_EN_Pin GPIO_PIN_8
+#define USB_OTGFS_PPWR_EN_GPIO_Port GPIOG
+#define CODEC_I2S3_MCK_Pin GPIO_PIN_7
+#define CODEC_I2S3_MCK_GPIO_Port GPIOC
+#define uSD_D0_Pin GPIO_PIN_8
+#define uSD_D0_GPIO_Port GPIOC
+#define uSD_D1_Pin GPIO_PIN_9
+#define uSD_D1_GPIO_Port GPIOC
+#define M2_CKINA8_Pin GPIO_PIN_8
+#define M2_CKINA8_GPIO_Port GPIOA
+#define USB_OTGFS_VBUS_Pin GPIO_PIN_9
+#define USB_OTGFS_VBUS_GPIO_Port GPIOA
+#define USB_OTGFS_ID_Pin GPIO_PIN_10
+#define USB_OTGFS_ID_GPIO_Port GPIOA
+#define USB_OTGFS_DM_Pin GPIO_PIN_11
+#define USB_OTGFS_DM_GPIO_Port GPIOA
+#define USB_OTGFS_DP_Pin GPIO_PIN_12
+#define USB_OTGFS_DP_GPIO_Port GPIOA
+#define SWDIO_Pin GPIO_PIN_13
+#define SWDIO_GPIO_Port GPIOA
+#define SWCLK_Pin GPIO_PIN_14
+#define SWCLK_GPIO_Port GPIOA
+#define uSD_D2_Pin GPIO_PIN_10
+#define uSD_D2_GPIO_Port GPIOC
+#define uSD_D3_Pin GPIO_PIN_11
+#define uSD_D3_GPIO_Port GPIOC
+#define uSD_CLK_Pin GPIO_PIN_12
+#define uSD_CLK_GPIO_Port GPIOC
+#define D2_Pin GPIO_PIN_0
+#define D2_GPIO_Port GPIOD
+#define D3_Pin GPIO_PIN_1
+#define D3_GPIO_Port GPIOD
+#define uSD_CMD_Pin GPIO_PIN_2
+#define uSD_CMD_GPIO_Port GPIOD
+#define uSD_DETECT_Pin GPIO_PIN_3
+#define uSD_DETECT_GPIO_Port GPIOD
+#define FMC_NOE_Pin GPIO_PIN_4
+#define FMC_NOE_GPIO_Port GPIOD
+#define FMC_NWE_Pin GPIO_PIN_5
+#define FMC_NWE_GPIO_Port GPIOD
+#define FMC_NE1_Pin GPIO_PIN_7
+#define FMC_NE1_GPIO_Port GPIOD
 #define SWO_Pin GPIO_PIN_3
 #define SWO_GPIO_Port GPIOB
+#define CODEC_I2S3ext_SD_Pin GPIO_PIN_4
+#define CODEC_I2S3ext_SD_GPIO_Port GPIOB
+#define CODEC_I2S3_SD_Pin GPIO_PIN_5
+#define CODEC_I2S3_SD_GPIO_Port GPIOB
+#define I2C1_SCL_Pin GPIO_PIN_6
+#define I2C1_SCL_GPIO_Port GPIOB
+#define I2C1_SDA_Pin GPIO_PIN_7
+#define I2C1_SDA_GPIO_Port GPIOB
+#define I2C2_SDA_Pin GPIO_PIN_9
+#define I2C2_SDA_GPIO_Port GPIOB
+#define LED1_Pin GPIO_PIN_0
+#define LED1_GPIO_Port GPIOE
+#define LED2_Pin GPIO_PIN_1
+#define LED2_GPIO_Port GPIOE
 
 //UART_HandleTypeDef huart2;
 
@@ -58,7 +197,7 @@
 #include "common-hal/pulseio/PulseOut.h"
 #include "common-hal/pulseio/PulseIn.h"
 #include "common-hal/rtc/RTC.h"
-#include "tick.h"
+
 */
 
 //#include "shared-bindings/rtc/__init__.h"
@@ -68,75 +207,90 @@ static void power_warning_handler(void) {
 }
 
 safe_mode_t port_init(void) {
-
 	HAL_Init();
 
-	//clock setup
+	//System clock init
 	RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 	RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
+	RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
 	/** Configure the main internal regulator output voltage 
 	*/
 	__HAL_RCC_PWR_CLK_ENABLE();
 	__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
 	/** Initializes the CPU, AHB and APB busses clocks 
 	*/
-	RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
+	RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE;
+	RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
 	RCC_OscInitStruct.HSIState = RCC_HSI_ON;
 	RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
 	RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-	RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
-	RCC_OscInitStruct.PLL.PLLM = 16;
-	RCC_OscInitStruct.PLL.PLLN = 336;
-	RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
-	RCC_OscInitStruct.PLL.PLLQ = 4;
+	RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+	RCC_OscInitStruct.PLL.PLLM = 4;
+	RCC_OscInitStruct.PLL.PLLN = 72;
+	RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+	RCC_OscInitStruct.PLL.PLLQ = 3;
+	RCC_OscInitStruct.PLL.PLLR = 2;
 	/** Initializes the CPU, AHB and APB busses clocks 
 	*/
 	RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-	                          |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+	                      |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
 	RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
 	RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
 	RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
 	RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-	
+	PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2S_APB1|RCC_PERIPHCLK_SDIO
+	                      |RCC_PERIPHCLK_CLK48;
+	PeriphClkInitStruct.PLLI2S.PLLI2SN = 50;
+	PeriphClkInitStruct.PLLI2S.PLLI2SM = 4;
+	PeriphClkInitStruct.PLLI2S.PLLI2SR = 2;
+	PeriphClkInitStruct.PLLI2S.PLLI2SQ = 2;
+	PeriphClkInitStruct.Clk48ClockSelection = RCC_CLK48CLKSOURCE_PLLQ;
+	PeriphClkInitStruct.SdioClockSelection = RCC_SDIOCLKSOURCE_CLK48;
+	PeriphClkInitStruct.PLLI2SSelection = RCC_PLLI2SCLKSOURCE_PLLSRC;
+	PeriphClkInitStruct.I2sApb1ClockSelection = RCC_I2SAPB1CLKSOURCE_PLLI2S;
+	HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
 
-	//GPIO setup
+	//GPIO Init
 	GPIO_InitTypeDef GPIO_InitStruct = {0};
-
 	/* GPIO Ports Clock Enable */
+	__HAL_RCC_GPIOE_CLK_ENABLE();
 	__HAL_RCC_GPIOC_CLK_ENABLE();
+	__HAL_RCC_GPIOF_CLK_ENABLE();
 	__HAL_RCC_GPIOH_CLK_ENABLE();
 	__HAL_RCC_GPIOA_CLK_ENABLE();
 	__HAL_RCC_GPIOB_CLK_ENABLE();
-
+	__HAL_RCC_GPIOG_CLK_ENABLE();
+	__HAL_RCC_GPIOD_CLK_ENABLE();
 	/*Configure GPIO pin Output Level */
-	HAL_GPIO_WritePin(LD2_GPIO_Port, LD2_Pin, GPIO_PIN_RESET);
-
-	/*Configure GPIO pin : B1_Pin */
-	GPIO_InitStruct.Pin = B1_Pin;
-	GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
+	HAL_GPIO_WritePin(GPIOE, LED3_Pin|LED4_Pin|LED1_Pin|LED2_Pin, GPIO_PIN_RESET);
+	/*Configure GPIO pin Output Level */
+	HAL_GPIO_WritePin(GPIOF, LCD_BLCTRL_Pin|EXT_RESET_Pin|CTP_RST_Pin, GPIO_PIN_RESET);
+	/*Configure GPIO pin Output Level */
+	HAL_GPIO_WritePin(LCD_RESET_GPIO_Port, LCD_RESET_Pin, GPIO_PIN_RESET);
+	/*Configure GPIO pin Output Level */
+	HAL_GPIO_WritePin(USB_OTGFS_PPWR_EN_GPIO_Port, USB_OTGFS_PPWR_EN_Pin, GPIO_PIN_SET);
+	/*Configure GPIO pins : LED3_Pin LED4_Pin LED1_Pin LED2_Pin */
+	GPIO_InitStruct.Pin = LED3_Pin|LED4_Pin|LED1_Pin|LED2_Pin;
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
 	GPIO_InitStruct.Pull = GPIO_NOPULL;
-	HAL_GPIO_Init(B1_GPIO_Port, &GPIO_InitStruct);
-
-	/*Configure GPIO pin : LD2_Pin */
-	GPIO_InitStruct.Pin = LD2_Pin;
-	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+	HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
+	/*Configure GPIO pin : USB_OTGFS_PPWR_EN_Pin */
+	GPIO_InitStruct.Pin = USB_OTGFS_PPWR_EN_Pin;
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
 	GPIO_InitStruct.Pull = GPIO_NOPULL;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-	HAL_GPIO_Init(LD2_GPIO_Port, &GPIO_InitStruct);
-	
-
-	//USART2 setup
-	// huart2.Instance = USART2;
-	// huart2.Init.BaudRate = 115200;
-	// huart2.Init.WordLength = UART_WORDLENGTH_8B;
-	// huart2.Init.StopBits = UART_STOPBITS_1;
-	// huart2.Init.Parity = UART_PARITY_NONE;
-	// huart2.Init.Mode = UART_MODE_TX_RX;
-	// huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-	// huart2.Init.OverSampling = UART_OVERSAMPLING_16;
-
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_5, GPIO_PIN_SET);
+	HAL_GPIO_Init(USB_OTGFS_PPWR_EN_GPIO_Port, &GPIO_InitStruct);
+
+  	//turn on LED
+	HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_RESET);
+	HAL_GPIO_WritePin(LED2_GPIO_Port, LED2_Pin, GPIO_PIN_SET);
+	HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET);
+    HAL_GPIO_WritePin(LED4_GPIO_Port, LED4_Pin, GPIO_PIN_SET);
+
+
+    tick_init();
+    board_init(); 
 
     return NO_SAFE_MODE;
 }
diff --git a/ports/stm32f4/cubeMXsrc/system_stm32f4xx.c b/ports/stm32f4/system_stm32f4xx.c
index 3303f969d..3303f969d 100644
--- a/ports/stm32f4/cubeMXsrc/system_stm32f4xx.c
+++ b/ports/stm32f4/system_stm32f4xx.c
diff --git a/ports/stm32f4/tick.c b/ports/stm32f4/tick.c
index 41fdac6ff..2596e34d1 100644
--- a/ports/stm32f4/tick.c
+++ b/ports/stm32f4/tick.c
@@ -31,6 +31,8 @@
 #include "shared-module/gamepad/__init__.h"
 #include "shared-bindings/microcontroller/Processor.h"
 
+#include "stm32f4xx.h"
+
 // Global millisecond tick count
 volatile uint64_t ticks_ms = 0;
 
@@ -54,30 +56,30 @@ void SysTick_Handler(void) {
 
 void tick_init() {
     uint32_t ticks_per_ms = 16000000/ 1000;
-    //SysTick_Config(ticks_per_ms); // interrupt is enabled
+    SysTick_Config(ticks_per_ms); // interrupt is enabled
 }
 
 void tick_delay(uint32_t us) {
-    // uint32_t ticks_per_us = 16000000 / 1000 / 1000;
-    // uint32_t us_between_ticks = SysTick->VAL / ticks_per_us;
-    // uint64_t start_ms = ticks_ms;
-    // while (us > 1000) {
-    //     while (ticks_ms == start_ms) {}
-    //     us -= us_between_ticks;
-    //     start_ms = ticks_ms;
-    //     us_between_ticks = 1000;
-    // }
-    //while (SysTick->VAL > ((us_between_ticks - us) * ticks_per_us)) {}
+    uint32_t ticks_per_us = 16000000 / 1000 / 1000;
+    uint32_t us_between_ticks = SysTick->VAL / ticks_per_us;
+    uint64_t start_ms = ticks_ms;
+    while (us > 1000) {
+        while (ticks_ms == start_ms) {}
+        us -= us_between_ticks;
+        start_ms = ticks_ms;
+        us_between_ticks = 1000;
+    }
+    while (SysTick->VAL > ((us_between_ticks - us) * ticks_per_us)) {}
 }
 
 // us counts down!
 void current_tick(uint64_t* ms, uint32_t* us_until_ms) {
     uint32_t ticks_per_us = 16000000 / 1000 / 1000;
     *ms = ticks_ms;
-    //*us_until_ms = SysTick->VAL / ticks_per_us;
+    *us_until_ms = SysTick->VAL / ticks_per_us;
 }
 
 void wait_until(uint64_t ms, uint32_t us_until_ms) {
     uint32_t ticks_per_us = 16000000 / 1000 / 1000;
-    //while(ticks_ms <= ms && SysTick->VAL / ticks_per_us >= us_until_ms) {}
+    while(ticks_ms <= ms && SysTick->VAL / ticks_per_us >= us_until_ms) {}
 }