Jelajahi Sumber

f3 use offical st driver repo

hathach 5 tahun lalu
induk
melakukan
1e02f6e066

+ 6 - 0
.gitmodules

@@ -55,3 +55,9 @@
 [submodule "hw/mcu/st/stm32f2xx_hal_driver"]
 	path = hw/mcu/st/stm32f2xx_hal_driver
 	url = https://github.com/STMicroelectronics/stm32f2xx_hal_driver.git
+[submodule "hw/mcu/st/cmsis_device_f3"]
+	path = hw/mcu/st/cmsis_device_f3
+	url = https://github.com/STMicroelectronics/cmsis_device_f3.git
+[submodule "hw/mcu/st/stm32f3xx_hal_driver"]
+	path = hw/mcu/st/stm32f3xx_hal_driver
+	url = https://github.com/STMicroelectronics/stm32f3xx_hal_driver.git

+ 9 - 8
hw/bsp/stm32f303disco/board.mk

@@ -12,19 +12,20 @@ CFLAGS += \
 # mcu driver cause following warnings
 CFLAGS += -Wno-error=unused-parameter
 
-ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F3xx_HAL_Driver
-ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F3xx
+ST_FAMILY = f3
+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)/STM32F303VCTx_FLASH.ld
 
 SRC_C += \
-  $(ST_CMSIS)/Source/Templates/system_stm32f3xx.c \
-  $(ST_HAL_DRIVER)/Src/stm32f3xx_hal.c \
-  $(ST_HAL_DRIVER)/Src/stm32f3xx_hal_cortex.c \
-  $(ST_HAL_DRIVER)/Src/stm32f3xx_hal_rcc.c \
-  $(ST_HAL_DRIVER)/Src/stm32f3xx_hal_rcc_ex.c \
-  $(ST_HAL_DRIVER)/Src/stm32f3xx_hal_gpio.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
 
 SRC_S += \
   $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f303xc.s

+ 1 - 0
hw/mcu/st/cmsis_device_f3

@@ -0,0 +1 @@
+Subproject commit 5e4ee5ed7a7b6c85176bb70a9fd3c72d6eb99f1b

+ 1 - 0
hw/mcu/st/stm32f3xx_hal_driver

@@ -0,0 +1 @@
+Subproject commit 1761b6207318ede021706e75aae78f452d72b6fa