Переглянути джерело

f2 use offical st driver repo

hathach 5 роки тому
батько
коміт
bbcf2d7e01

+ 6 - 0
.gitmodules

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

+ 10 - 8
hw/bsp/stm32f207nucleo/board.mk

@@ -11,19 +11,21 @@ CFLAGS += \
 # mcu driver cause following warnings
 CFLAGS += -Wno-error=sign-compare
 
-ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F2xx_HAL_Driver
-ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F2xx
+ST_FAMILY = f2
+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)/STM32F207ZGTx_FLASH.ld
 
 SRC_C += \
-  $(ST_CMSIS)/Source/Templates/system_stm32f2xx.c \
-  $(ST_HAL_DRIVER)/Src/stm32f2xx_hal.c \
-  $(ST_HAL_DRIVER)/Src/stm32f2xx_hal_cortex.c \
-  $(ST_HAL_DRIVER)/Src/stm32f2xx_hal_rcc.c \
-  $(ST_HAL_DRIVER)/Src/stm32f2xx_hal_rcc_ex.c \
-  $(ST_HAL_DRIVER)/Src/stm32f2xx_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_stm32f207xx.s

+ 1 - 0
hw/mcu/st/cmsis_device_f2

@@ -0,0 +1 @@
+Subproject commit 182fcb3681ce116816feb41b7764f1b019ce796f

+ 1 - 0
hw/mcu/st/stm32f2xx_hal_driver

@@ -0,0 +1 @@
+Subproject commit c75ace9b908a9aca631193ebf2466963b8ea33d0