hathach 5 лет назад
Родитель
Сommit
8850ea90b4
4 измененных файлов с 17 добавлено и 8 удалено
  1. 6 0
      .gitmodules
  2. 9 8
      hw/bsp/stm32f103bluepill/board.mk
  3. 1 0
      hw/mcu/st/cmsis_device_f1
  4. 1 0
      hw/mcu/st/stm32f1xx_hal_driver

+ 6 - 0
.gitmodules

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

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

@@ -11,19 +11,20 @@ CFLAGS += \
 # mcu driver cause following warnings
 #CFLAGS += -Wno-error=unused-parameter
 
-ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F1xx_HAL_Driver
-ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F1xx
+ST_FAMILY = f1
+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)/STM32F103XB_FLASH.ld
 
 SRC_C += \
-  $(ST_CMSIS)/Source/Templates/system_stm32f1xx.c \
-  $(ST_HAL_DRIVER)/Src/stm32f1xx_hal.c \
-  $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_cortex.c \
-  $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_rcc.c \
-  $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_rcc_ex.c \
-  $(ST_HAL_DRIVER)/Src/stm32f1xx_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_stm32f103xb.s

+ 1 - 0
hw/mcu/st/cmsis_device_f1

@@ -0,0 +1 @@
+Subproject commit 6601104a6397299b7304fd5bcd9a491f56cb23a6

+ 1 - 0
hw/mcu/st/stm32f1xx_hal_driver

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