From b9ca7e91dff4861a4ca2c65f462b6b1cbf9e06cc Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 30 Oct 2020 13:18:56 +0700 Subject: [PATCH] f7 use offical st driver repo --- .gitmodules | 6 ++++++ hw/bsp/stlinkv3mini/board.mk | 21 +++++++++++---------- hw/bsp/stm32f723disco/board.mk | 21 +++++++++++---------- hw/bsp/stm32f746disco/board.mk | 21 +++++++++++---------- hw/bsp/stm32f746nucleo/board.mk | 21 +++++++++++---------- hw/bsp/stm32f767nucleo/board.mk | 21 +++++++++++---------- hw/bsp/stm32f769disco/board.mk | 21 +++++++++++---------- hw/mcu/st/cmsis_device_f7 | 1 + hw/mcu/st/stm32f7xx_hal_driver | 1 + 9 files changed, 74 insertions(+), 60 deletions(-) create mode 160000 hw/mcu/st/cmsis_device_f7 create mode 160000 hw/mcu/st/stm32f7xx_hal_driver diff --git a/.gitmodules b/.gitmodules index 3a3f50fcc..abf1439a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,9 @@ [submodule "hw/mcu/st/stm32f3xx_hal_driver"] path = hw/mcu/st/stm32f3xx_hal_driver url = https://github.com/STMicroelectronics/stm32f3xx_hal_driver.git +[submodule "hw/mcu/st/cmsis_device_f7"] + path = hw/mcu/st/cmsis_device_f7 + url = https://github.com/STMicroelectronics/cmsis_device_f7.git +[submodule "hw/mcu/st/stm32f7xx_hal_driver"] + path = hw/mcu/st/stm32f7xx_hal_driver + url = https://github.com/STMicroelectronics/stm32f7xx_hal_driver.git diff --git a/hw/bsp/stlinkv3mini/board.mk b/hw/bsp/stlinkv3mini/board.mk index 4ca6cfd68..5157fbf14 100644 --- a/hw/bsp/stlinkv3mini/board.mk +++ b/hw/bsp/stlinkv3mini/board.mk @@ -26,21 +26,22 @@ endif # mcu driver cause following warnings CFLAGS += -Wno-error=shadow -Wno-error=cast-align -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F7xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F7xx +ST_FAMILY = f7 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F723xE_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f7xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_gpio.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_uart.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_pwr_ex.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f723xx.s diff --git a/hw/bsp/stm32f723disco/board.mk b/hw/bsp/stm32f723disco/board.mk index 9ec23bfde..50c25810f 100644 --- a/hw/bsp/stm32f723disco/board.mk +++ b/hw/bsp/stm32f723disco/board.mk @@ -29,21 +29,22 @@ endif # mcu driver cause following warnings CFLAGS += -Wno-error=shadow -Wno-error=cast-align -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F7xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F7xx +ST_FAMILY = f7 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F723xE_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f7xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_gpio.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_uart.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_pwr_ex.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f723xx.s diff --git a/hw/bsp/stm32f746disco/board.mk b/hw/bsp/stm32f746disco/board.mk index 48cb3f141..95feac1f6 100644 --- a/hw/bsp/stm32f746disco/board.mk +++ b/hw/bsp/stm32f746disco/board.mk @@ -29,21 +29,22 @@ endif # mcu driver cause following warnings CFLAGS += -Wno-error=shadow -Wno-error=cast-align -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F7xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F7xx +ST_FAMILY = f7 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F746ZGTx_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f7xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_gpio.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_uart.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_pwr_ex.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f746xx.s diff --git a/hw/bsp/stm32f746nucleo/board.mk b/hw/bsp/stm32f746nucleo/board.mk index 95445486a..140e2d639 100644 --- a/hw/bsp/stm32f746nucleo/board.mk +++ b/hw/bsp/stm32f746nucleo/board.mk @@ -12,21 +12,22 @@ CFLAGS += \ # suppress warning caused by vendor mcu driver CFLAGS += -Wno-error=cast-align -Wno-error=shadow -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F7xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F7xx +ST_FAMILY = f7 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F746ZGTx_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f7xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_gpio.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_uart.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_pwr_ex.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f746xx.s diff --git a/hw/bsp/stm32f767nucleo/board.mk b/hw/bsp/stm32f767nucleo/board.mk index fc638ddcb..c6be2bcbf 100644 --- a/hw/bsp/stm32f767nucleo/board.mk +++ b/hw/bsp/stm32f767nucleo/board.mk @@ -12,21 +12,22 @@ CFLAGS += \ # suppress warning caused by vendor mcu driver CFLAGS += -Wno-error=cast-align -Wno-error=shadow -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F7xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F7xx +ST_FAMILY = f7 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F767ZITx_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f7xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_gpio.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_uart.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_pwr_ex.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f767xx.s diff --git a/hw/bsp/stm32f769disco/board.mk b/hw/bsp/stm32f769disco/board.mk index 962dddc68..ced2240c0 100644 --- a/hw/bsp/stm32f769disco/board.mk +++ b/hw/bsp/stm32f769disco/board.mk @@ -26,21 +26,22 @@ endif # suppress warning caused by vendor mcu driver CFLAGS += -Wno-error=cast-align -Wno-error=shadow -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F7xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F7xx +ST_FAMILY = f7 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F769ZITx_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f7xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_gpio.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_uart.c \ - $(ST_HAL_DRIVER)/Src/stm32f7xx_hal_pwr_ex.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f769xx.s diff --git a/hw/mcu/st/cmsis_device_f7 b/hw/mcu/st/cmsis_device_f7 new file mode 160000 index 000000000..fc676ef1a --- /dev/null +++ b/hw/mcu/st/cmsis_device_f7 @@ -0,0 +1 @@ +Subproject commit fc676ef1ad177eb874eaa06444d3d75395fc51f4 diff --git a/hw/mcu/st/stm32f7xx_hal_driver b/hw/mcu/st/stm32f7xx_hal_driver new file mode 160000 index 000000000..f7ffdf6bf --- /dev/null +++ b/hw/mcu/st/stm32f7xx_hal_driver @@ -0,0 +1 @@ +Subproject commit f7ffdf6bf72110e58b42c632b0a051df5997e4ee